diff --git a/.flake8 b/.flake8
index 7da04bf939d..458a9f9188c 100644
--- a/.flake8
+++ b/.flake8
@@ -20,6 +20,7 @@ per-file-ignores =
     # E741 ambiguous variable name 'l'
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 0821b09838 (Checks: Fix Flake8 W605 - invalid escape sequence (#3763))
@@ -47,6 +48,8 @@ per-file-ignores =
 =======
 >>>>>>> cfa8c4eeca (Checks: Fix Flake8 W605 - invalid escape sequence (#3763))
 >>>>>>> 0821b09838 (Checks: Fix Flake8 W605 - invalid escape sequence (#3763))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     man/build_html.py: E501
 <<<<<<< HEAD
     man/build_md.py: E501
@@ -153,6 +156,7 @@ per-file-ignores =
     gui/wxpython/startup/locdownload.py: E722, E402
     gui/wxpython/timeline/g.gui.timeline.py: E501
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     gui/wxpython/tools/build_modules_xml.py: E722
     gui/wxpython/web_services/cap_interface.py: E501
@@ -197,6 +201,8 @@ per-file-ignores =
 >>>>>>> ba65a804c6 (Checks: fix flake8 E741 in gui/wxpython directory (#3926))
 >>>>>>> 3a3b3fa8db (Checks: fix flake8 E741 in gui/wxpython directory (#3926))
 >>>>>>> 16b2bafce3 (Checks: fix flake8 E741 in gui/wxpython directory (#3926))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     # Generated file
     gui/wxpython/menustrings.py: E501
     # F821 undefined name 'cmp'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8655b19bae7..8accd5dc58d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -89,6 +89,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 =======
@@ -139,6 +140,9 @@ jobs:
 >>>>>>> 1a779126bc (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> 6c2bbd4089 (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> c384ba3d8c (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
+=======
+        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -169,6 +173,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 =======
@@ -219,5 +224,8 @@ jobs:
 >>>>>>> 1a779126bc (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> 6c2bbd4089 (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> c384ba3d8c (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
+=======
+        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9566337b432..3493fabd743 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -128,6 +128,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
 =======
@@ -170,6 +171,9 @@ jobs:
         uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
 >>>>>>> db4f23459c (CI(deps): Update docker/build-push-action action to v6.3.0 (#3976))
 >>>>>>> 3d802a7bcb (CI(deps): Update docker/build-push-action action to v6.3.0 (#3976))
+=======
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           push: true
           pull: true
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index fe848ce4a66..9d8915d1534 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 >>>>>>> d4a11a7eae (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
       - name: Setup Mamba
-        uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e # v2.0.1
+        uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 # v2.0.2
         with:
           init-shell: bash
           environment-file: .github/workflows/macos_dependencies.txt
diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index f66f35a7d46..52ea1b1c46f 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -34,6 +34,7 @@ jobs:
 <<<<<<< HEAD
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       - uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1
 =======
@@ -53,6 +54,9 @@ jobs:
 >>>>>>> d4a11a7eae (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
 >>>>>>> 9dae335815 (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
 >>>>>>> 04e6857dc2 (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
+=======
+      - uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1 # v2.25.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           path-type: inherit
           location: D:\
diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
index 38ff6774453..289ec55c016 100644
--- a/.github/workflows/python-code-quality.yml
+++ b/.github/workflows/python-code-quality.yml
@@ -56,6 +56,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       RUFF_VERSION: "0.5.1"
 =======
@@ -230,6 +231,9 @@ jobs:
 >>>>>>> 309fcfbf04 (CI(deps): Update dependency ruff to v0.5.1 (#3983))
 =======
 >>>>>>> 86958332ef (CI(deps): Update ruff to v0.7.2 (#4631))
+=======
+      RUFF_VERSION: "0.8.0"
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 
     runs-on: ${{ matrix.os }}
     permissions:
@@ -400,6 +404,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 =======
@@ -450,6 +455,9 @@ jobs:
 >>>>>>> 1a779126bc (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> 6c2bbd4089 (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> c384ba3d8c (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
+=======
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           sarif_file: bandit.sarif
 
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
index 748dd65d764..b61a3c5b3d2 100644
--- a/.github/workflows/super-linter.yml
+++ b/.github/workflows/super-linter.yml
@@ -37,6 +37,7 @@ jobs:
       - name: Lint code base
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: super-linter/super-linter/slim@b92721f792f381cedc002ecdbb9847a15ece5bb8 # v7.1.0
 =======
@@ -55,6 +56,9 @@ jobs:
 >>>>>>> 31def23932 (CI(deps): Update super-linter/super-linter action to v6.7.0 (#4002))
 >>>>>>> 8938eb13e8 (CI(deps): Update super-linter/super-linter action to v6.7.0 (#4002))
 >>>>>>> 98c5477af1 (CI(deps): Update super-linter/super-linter action to v6.7.0 (#4002))
+=======
+        uses: super-linter/super-linter/slim@e1cb86b6e8d119f789513668b4b30bf17fe1efe4 # v7.2.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         env:
           DEFAULT_BRANCH: main
           # To report GitHub Actions status checks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 958cc125ad9..f64e810dd12 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -56,6 +56,7 @@ repos:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     rev: v0.5.1
 =======
@@ -225,6 +226,9 @@ repos:
 >>>>>>> 79c03e82ac (CI(deps): Update ruff to v0.7.2 (#4631))
 >>>>>>> 2d8985db52 (CI(deps): Update ruff to v0.7.2 (#4631))
 >>>>>>> 86958332ef (CI(deps): Update ruff to v0.7.2 (#4631))
+=======
+    rev: v0.8.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     hooks:
       # Run the linter.
       - id: ruff
diff --git a/db/db.connect/db.connect.html b/db/db.connect/db.connect.html
index 48d6dbee02f..434124b4e65 100644
--- a/db/db.connect/db.connect.html
+++ b/db/db.connect/db.connect.html
@@ -36,7 +36,7 @@ <h3>SQLite (default backend)</h3>
 <h3>PostgreSQL (local connection)</h3>
 
 Local storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=pg database=mydb
@@ -49,7 +49,7 @@ <h3>PostgreSQL (local connection)</h3>
 <h3>PostgreSQL (network connection)</h3>
 
 Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=pg database=mydb
@@ -62,7 +62,7 @@ <h3>PostgreSQL (network connection)</h3>
 <h3>MySQL (local connection)</h3>
 
 Local storage, database tables stored in database "mydb" (may require
-the use of <em><a href=db.login.html>db.login</a></em>):
+the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=mysql database=mydb
@@ -75,7 +75,7 @@ <h3>MySQL (local connection)</h3>
 <h3>MySQL (network connection)</h3>
 
 Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=mysql database=mydb
@@ -88,7 +88,7 @@ <h3>MySQL (network connection)</h3>
 <h3>ODBC</h3>
 
 Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=odbc database=mydb
diff --git a/db/drivers/README b/db/drivers/README
deleted file mode 100644
index e2a2d435f2e..00000000000
--- a/db/drivers/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This directory contains drivers for the DBMI library.
-The driver functions are for internal usage.
-
-The DBMI API to be used for module programming is available in:
-lib/db/
-
-
-NOTE:
-db__driver_* functions are implemented in a driver.  If some of them
-are not used or defined, the driver will use stub functions in
-lib/db/stubs/
-
-For some platforms like Cygwin, multiply defined symbols are not
-resolved in a way that UNIX does.  Even worse is that it is impossible
-to build shared libraries with undefined symbols.  For example,
-libgrass_dbmidriver.so cannot be built without any implementations
-of db__driver_* functions which should be specific to a db driver.
-
-To work around this problem, function pointers are defined to use
-driver's implementations instead of those of the db stubs library.
-To do this automatically, run '../mk_dbdriver_h.sh' in driver's
-directory, #include "dbdriver.h" from main.c, and execute init_dbdriver().
-
-Function pointers are defined in grass6/lib/db/dbmi_driver/dbstubs.h
-This header file can be generated with
-lib/db/dbmi_driver/mk_dbstubs_h.sh
-
-Please read lib/db/README
diff --git a/db/drivers/README.md b/db/drivers/README.md
new file mode 100644
index 00000000000..e98c617267c
--- /dev/null
+++ b/db/drivers/README.md
@@ -0,0 +1,30 @@
+This directory contains drivers for the DBMI library.
+The driver functions are for internal usage.
+
+The DBMI API to be used for module programming is available in:
+`lib/db/`
+
+NOTE:
+`db__driver_*` functions are implemented in a driver. If some of them
+are not used or defined, the driver will use stub functions in
+`lib/db/stubs/`.
+
+For some platforms like Cygwin, multiply defined symbols are not
+resolved in a way that UNIX does. Even worse is that it is impossible
+to build shared libraries with undefined symbols. For example,
+`libgrass*dbmidriver.so` cannot be built without any implementations
+of `db__driver*\*` functions which should be specific to a db driver.
+
+To work around this problem, function pointers are defined to use
+driver's implementations instead of those of the db stubs library.
+To do this automatically, run `../mk_dbdriver_h.sh` (GRASS GIS 6)
+in driver's directory, `#include "dbdriver.h"` from `main.c`, and
+execute `init_dbdriver()`.
+
+Function pointers are defined in `lib/db/dbmi_driver/dbstubs.h`
+This header file can be generated with
+`lib/db/dbmi_driver/mk_dbstubs_h.sh` (GRASS GIS 6).
+
+Please read lib/db/README.md and
+
+<https://grass.osgeo.org/programming8/dbmilib.html>
diff --git a/db/drivers/mysql/grass-mesql.html b/db/drivers/mysql/grass-mesql.html
index cc9076fde6e..03a8ed219ec 100644
--- a/db/drivers/mysql/grass-mesql.html
+++ b/db/drivers/mysql/grass-mesql.html
@@ -1,28 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>GRASS-MySQL embedded driver - GRASS GIS manual</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <link rel="stylesheet" href="grassdocs.css" type="text/css">
- <meta http-equiv="content-language" content="en-us">
- <meta name="viewport" content="width=device-width, initial-scale=1">
-</head>
-<body bgcolor="white">
-
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
-
 <!-- meta page description: MySQL embedded driver -->
-<h1>MySQL embedded driver in GRASS</h1>
-
-<h2>KEYWORDS</h2>
 
-database, attribute table, driver
-
-<h2>DESCRIPTION</h2>
-
-MySQL database driver in GRASS enables GRASS to store vector
-attributes in MySQL embedded database without necessity
-to run MySQL server.
+MySQL database driver enables GRASS to store vector attributes
+in MySQL embedded database without necessity to run MySQL server.
 
 <h2>Driver and database name</h2>
 
@@ -68,14 +47,7 @@ <h2>Troubleshooting: SQL syntax error</h2>
 
 Attempting to use a reserved SQL word as column or table name will result
 in a "SQL syntax" error. The list of reserved words for MySQL can be
-found in the <a href="http://dev.mysql.com/doc/refman/5.7/en/reserved-words.html#table-reserved-words-5.7.4">MySQL manual</a>.
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="db.connect.html">db.connect</a>,
-<a href="sql.html">SQL support in GRASS GIS</a>
-</em>
+found in the <a href="https://dev.mysql.com/doc/refman/8.4/en/keywords.html#keywords-in-current-series">MySQL manual</a>.
 
 <h2>AUTHOR</h2>
 
@@ -92,6 +64,7 @@ <h2>AUTHOR</h2>
 =======
 >>>>>>> 4217d7b0d6 (wxpyimgview: explicit conversion to int (#2704))
 <a href="https://www.faunalia.it">Faunalia</a> (Italy)
+<<<<<<< HEAD
 =======
 <a href="http://www.faunalia.it">Faunalia</a> (Italy)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -108,8 +81,13 @@ <h2>AUTHOR</h2>
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 4217d7b0d6 (wxpyimgview: explicit conversion to int (#2704))
 as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
+=======
+as part of a project for <a href="https://www.atac.roma.it/">ATAC</a>.
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 
+<h2>SEE ALSO</h2>
 
+<<<<<<< HEAD
 <hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <<<<<<< HEAD
@@ -3234,3 +3212,9 @@ <h2>AUTHOR</h2>
 >>>>>>> d3f362186e (wxpyimgview: explicit conversion to int (#2704))
 </body>
 </html>
+=======
+<em>
+<a href="db.connect.html">db.connect</a>,
+<a href="sql.html">SQL support in GRASS GIS</a>
+</em>
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
diff --git a/db/drivers/mysql/grass-mysql.html b/db/drivers/mysql/grass-mysql.html
index 9584f5ff781..4d7016074d2 100644
--- a/db/drivers/mysql/grass-mysql.html
+++ b/db/drivers/mysql/grass-mysql.html
@@ -1,7 +1,7 @@
 <!-- meta page description: MySQL DATABASE DRIVER -->
 
-MySQL database driver enables GRASS to store vector attributes in
-MySQL server.
+MySQL database driver enables GRASS to store vector attributes
+in MySQL server.
 
 <p>
 Because vector attribute tables
@@ -36,30 +36,31 @@ <h2>Driver and database name</h2>
 	     <li> port - server port number
 	 </ul>
 </ul>
+<p>
 Examples of connection parameters:
 <pre>
-  db.connect driver=mysql database=mytest
-  db.connect driver=mysql database='dbname=mytest,host=test.grass.org'
+db.connect driver=mysql database=mytest
+db.connect driver=mysql database='dbname=mytest,host=test.grass.org'
 </pre>
 
 <h2>Data types</h2>
 
 GRASS supports almost all MySQL data types with following limitations:
 <ul>
-    <li> Binary columns (BINARY, VARBINARY, TINYBLOB, MEDIUMBLOB,
-    BLOB, LONGBLOB) are not not supported.
-    If a table with binary column(s) is used in GRASS
-    a warning is printed and only the supported columns are
-    returned in query results.
+<li> Binary columns (BINARY, VARBINARY, TINYBLOB, MEDIUMBLOB,
+BLOB, LONGBLOB) are not not supported.
+If a table with binary column(s) is used in GRASS
+a warning is printed and only the supported columns are
+returned in query results.
 
-    <li> Columns of type SET and ENUM are represented as string (VARCHAR).
+<li> Columns of type SET and ENUM are represented as string (VARCHAR).
 
-    <li> Very large integers in columns of type BIGINT can be lost
-    or corrupted because GRASS does not support 64 bin integeres
-    on most platforms.
+<li> Very large integers in columns of type BIGINT can be lost
+or corrupted because GRASS does not support 64 bin integeres
+on most platforms.
 
-    <li> GRASS does not currently distinguish types TIMESTAMP and
-    DATETIME. Both types are in GRASS interpreted as TIMESTAMP.
+<li> GRASS does not currently distinguish types TIMESTAMP and
+DATETIME. Both types are in GRASS interpreted as TIMESTAMP.
 </ul>
 
 <h2>Indexes</h2>
@@ -7772,7 +7773,16 @@ <h2>Troubleshooting: SQL syntax error</h2>
 
 Attempting to use a reserved SQL word as column or table name will result
 in a "SQL syntax" error. The list of reserved words for MySQL can be
-found in the <a href="http://dev.mysql.com/doc/refman/5.7/en/reserved-words.html#table-reserved-words-5.7.4">MySQL manual</a>.
+found in the <a href="https://dev.mysql.com/doc/refman/8.4/en/keywords.html#keywords-in-current-series">MySQL manual</a>.
+
+<h2>AUTHOR</h2>
+
+Radim Blazek
+
+<p>
+Credits: Development of the driver was sponsored by
+<a href="https://www.faunalia.it">Faunalia</a> (Italy)
+as part of a project for <a href="https://www.atac.roma.it/">ATAC</a>.
 
 <h2>SEE ALSO</h2>
 
@@ -7780,6 +7790,7 @@ <h2>SEE ALSO</h2>
 <a href="db.connect.html">db.connect</a>,
 <a href="sql.html">SQL support in GRASS GIS</a>
 </em>
+<<<<<<< HEAD
 
 <h2>Credits</h2>
 
@@ -10419,3 +10430,5 @@ <h2>Credits</h2>
 <h2>AUTHOR</h2>
 
 Radim Blazek
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
diff --git a/db/drivers/postgres/execute.c b/db/drivers/postgres/execute.c
index fa6dd556101..99a6c79df11 100644
--- a/db/drivers/postgres/execute.c
+++ b/db/drivers/postgres/execute.c
@@ -1,7 +1,7 @@
 /*!
    \file db/driver/postgres/execute.c
 
-   \brief DBMI - Low Level PostgreSQL database driver - execute statemets
+   \brief DBMI - Low Level PostgreSQL database driver - execute statements
 
    This program is free software under the GNU General Public License
    (>=v2). Read the file COPYING that comes with GRASS for details.
diff --git a/db/drivers/sqlite/grass-sqlite.html b/db/drivers/sqlite/grass-sqlite.html
index ae59def1e52..ea2f9526506 100644
--- a/db/drivers/sqlite/grass-sqlite.html
+++ b/db/drivers/sqlite/grass-sqlite.html
@@ -69,9 +69,13 @@ <h2>SEE ALSO</h2>
   <a href="db.connect.html">db.connect</a>,
   <a href="db.execute.html">db.execute</a>,
   <a href="db.select.html">db.select</a>
-  <br><br>
+</em>
+<br><br>
+<em>
   <a href="sql.html">SQL support in GRASS GIS</a>
-  <br><br>
+</em>
+<br><br>
+<em>
   <a href="https://www.sqlite.org">SQLite web site</a>,
   <a href="https://www.sqlite.org/quickstart.html">SQLite manual</a>,
   <a href="https://www.sqlite.org/cvstrac/wiki?p=ManagementTools">sqlite - Management Tools</a>
diff --git a/doc/vector/TODO b/doc/vector/TODO
index 75671559263..d43bffca15d 100644
--- a/doc/vector/TODO
+++ b/doc/vector/TODO
@@ -205,7 +205,7 @@ implemented in all drivers.
 SQLite driver
 -------------
 Current implementation is very slow with large updates/inserts. I
-think that it is because all statemets are parsed and it should be
+think that it is because all statements are parsed and it should be
 possible to improve by insert/update cursors (see above).
 
 DBF driver
diff --git a/docker/ubuntu/README.md b/docker/ubuntu/README.md
index 9a45651504c..a8f2764a239 100644
--- a/docker/ubuntu/README.md
+++ b/docker/ubuntu/README.md
@@ -88,7 +88,7 @@ bash-5.0#
 
 __To build a latest version with wxgui__:
 
-The `GUI` build argument allows to choose if the GUI should
+The `GUI` build argument allows choosing if the GUI should
 be included in the build (`GUI=with`) or not (`GUI=without`).
 
 ```bash
diff --git a/flake.lock b/flake.lock
index 1517386e8b5..02f788681bf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,6 +24,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         "lastModified": 1730958623,
         "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
@@ -95,6 +96,13 @@
 >>>>>>> cb08052097 (CI(deps): Lock file maintenance (#4643))
 >>>>>>> 49b2e446cf (CI(deps): Lock file maintenance (#4643))
 >>>>>>> 5aba09e445 (CI(deps): Lock file maintenance (#4643))
+=======
+        "lastModified": 1732238832,
+        "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         "type": "github"
       },
       "original": {
diff --git a/gui/wxpython/gcp/manager.py b/gui/wxpython/gcp/manager.py
index e8c444335de..0d4692e1aee 100644
--- a/gui/wxpython/gcp/manager.py
+++ b/gui/wxpython/gcp/manager.py
@@ -1774,6 +1774,7 @@ def OnFocus(self, event):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 =======
@@ -2608,6 +2609,9 @@ def OnFocus(self, event):
         # TODO: it is here just to remove old or obsolete beavior of base class
 >>>>>>> 57711afe47 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 90e8567102 (wxpyimgview: explicit conversion to int (#2704))
+=======
+        # TODO: it is here just to remove old or obsolete behavior of base class
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         #       gcp/MapPanel?
 =======
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
diff --git a/gui/wxpython/main_window/frame.py b/gui/wxpython/main_window/frame.py
index d219846bad6..b99f6711818 100644
--- a/gui/wxpython/main_window/frame.py
+++ b/gui/wxpython/main_window/frame.py
@@ -78133,6 +78133,7 @@ def RunDisplayCmd(self, command):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         :return int: False if failed, True if succcess
 >>>>>>> osgeo-main
@@ -78172,6 +78173,9 @@ def RunDisplayCmd(self, command):
 >>>>>>> f7d484e6ea (wxGUI: create parallel wx.frame for Single Window layout development (#1604))
 >>>>>>> 908bc330ca (wxGUI: create parallel wx.frame for Single Window layout development (#1604))
 >>>>>>> 502a15d233 (wxGUI: create parallel wx.frame for Single Window layout development (#1604))
+=======
+        :return int: False if failed, True if success
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         """
         if not self.currentPage:
             self.NewDisplay(show=True)
diff --git a/gui/wxpython/photo2image/ip2i_manager.py b/gui/wxpython/photo2image/ip2i_manager.py
index 2fb0a3d5763..453b12a2042 100644
--- a/gui/wxpython/photo2image/ip2i_manager.py
+++ b/gui/wxpython/photo2image/ip2i_manager.py
@@ -1144,6 +1144,7 @@ def OnFocus(self, event):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 =======
@@ -1978,6 +1979,9 @@ def OnFocus(self, event):
         # TODO: it is here just to remove old or obsolete beavior of base class
 >>>>>>> 57711afe47 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 90e8567102 (wxpyimgview: explicit conversion to int (#2704))
+=======
+        # TODO: it is here just to remove old or obsolete behavior of base class
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         #       gcp/MapPanel?
 =======
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
diff --git a/imagery/i.signatures/i.signatures.html b/imagery/i.signatures/i.signatures.html
index 403269ec84c..7f3ba1920e7 100644
--- a/imagery/i.signatures/i.signatures.html
+++ b/imagery/i.signatures/i.signatures.html
@@ -1,6 +1,6 @@
 <h2>DESCRIPTION</h2>
 
-<em>i.signatures</em> module allows to manage signature files:
+<em>i.signatures</em> module allows managing signature files:
 <ul>
     <li>"sig" – generated by <a href="i.gensig.html">i.gensig</a>
     for <a href="i.maxlik.html">i.maxlik</a></li>
diff --git a/lib/db/README b/lib/db/README
deleted file mode 100644
index 9dc8faf9ab6..00000000000
--- a/lib/db/README
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
- *
- * MODULE:       DBMI library
- * AUTHOR(S):    Joel Jones (CERL/UIUC) <jjones zorro.cecer.army.mil>
- *               Radim Blazek <radim.blazek gmail.com>,
- *               Brad Douglas <rez touchofmadness.com>,
- *               Glynn Clements <glynn gclements.plus.com>,
- *               Roberto Flor, Hamish Bowman <hamish_b yahoo.com>,
- *               Markus Neteler <neteler itc.it>,
- *               Huidae Cho <grass4u gmail.com>,
- *               Paul Kelly <paul-grass stjohnspoint.co.uk>,
- *               Martin Landa <landa.martin gmail.com>,
- *               Moritz Lennert <mlennert club.worldonline.be>,
- *               Daniel Calvelo Aros <dca.gis gmail.com>,
- *               Bernhard Reiter <bernhard intevation.de>,
- *               Alex Shevlakov <sixote yahoo.com>
- * PURPOSE:      database management functions for modules and drivers
- * COPYRIGHT:    (C) 2003-2006 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.
- *
- *****************************************************************************/
-
-DBMI Library
-
-Original author: Joel Jones (jjones * zorro.cecer.army.mil | jjones * uiuc.edu )
-            Ref: https://lists.osgeo.org/pipermail/grass-dev/1995-February/002015.html
-
-Directory contents:
-
-dbmi: DataBase Management Interface (db_*() functions)
-  dbmi_base:   contains functions for modules, drivers (../../db/drivers/)
-  dbmi_client: contains functions for modules
-  dbmi_driver: contains functions for drivers (../../db/drivers/)
-
-sqlp: SQL parser library
-stubs: stubs for unimplemented DB functions
-
-The DBMI drivers are stored in
-../../db/drivers/
-
-The DBMI user modules are stored in
-../../db/base/
-
-NOTE:
- Please read db/drivers/README
-
-To generate dbmi_driver/dbstubs.h automatically, run './mk_dbstubs_h.sh' in
-dbmi_driver/ directory.
diff --git a/lib/db/README.md b/lib/db/README.md
new file mode 100644
index 00000000000..227d628fa48
--- /dev/null
+++ b/lib/db/README.md
@@ -0,0 +1,59 @@
+## DBMI library
+
+### Purpose
+
+Database management functions for modules and drivers.
+
+### Authors
+
+Original author:
+
+- Joel Jones (CERL/UIUC) (jjones zorro.cecer.army.mil)
+
+Ref: <https://lists.osgeo.org/pipermail/grass-dev/1995-February/002015.html>
+
+Further authors:
+
+- Radim Blazek (radim.blazek gmail.com)
+- Brad Douglas (rez touchofmadness.com)
+- Glynn Clements (glynn gclements.plus.com)
+- Roberto Flor, Hamish Bowman (hamish_b yahoo.com)
+- Markus Neteler (neteler itc.it)
+- Huidae Cho (grass4u gmail.com)
+- Paul Kelly (paul-grass stjohnspoint.co.uk)
+- Martin Landa (landa.martin gmail.com)
+- Moritz Lennert (mlennert club.worldonline.be)
+- Daniel Calvelo Aros (dca.gis gmail.com)
+- Bernhard Reiter (bernhard intevation.de)
+- Alex Shevlakov (sixote yahoo.com)
+
+### Copyright
+
+(C) 2003-2024 by the GRASS Development Team
+
+### License
+
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+### Directory contents
+
+- `dbmi/`: DataBase Management Interface (`db_*()` functions)
+  - `dbmi_base/`: contains functions for modules, drivers (`../../db/drivers/`)
+  - `dbmi_client/`: contains functions for modules
+  - `dbmi_driver/`: contains functions for drivers (`../../db/drivers/`)
+- `sqlp/`: SQL parser library
+- `stubs/`: stubs for unimplemented DB functions
+
+The DBMI drivers are stored in
+`../../db/drivers/`
+
+The DBMI user modules are stored in
+`../../db/base/`
+
+NOTE:
+Please read db/drivers/README.md
+
+To generate `dbmi_driver/dbstubs.h` automatically, run `./mk_dbstubs_h.sh` in
+`dbmi_driver/` directory (GRASS GIS 6).
diff --git a/lib/db/dbmi_client/c_update.c b/lib/db/dbmi_client/c_update.c
index 9a8a0d6e4cd..399f19d8155 100644
--- a/lib/db/dbmi_client/c_update.c
+++ b/lib/db/dbmi_client/c_update.c
@@ -1,7 +1,7 @@
 /*!
  * \file db/dbmi_client/c_update.c
  *
- * \brief DBMI Library (client) - update statemets
+ * \brief DBMI Library (client) - update statements
  *
  * (C) 1999-2008 by the GRASS Development Team
  *
diff --git a/lib/db/dbmi_driver/d_update.c b/lib/db/dbmi_driver/d_update.c
index 5d601679082..ed7a501a7c4 100644
--- a/lib/db/dbmi_driver/d_update.c
+++ b/lib/db/dbmi_driver/d_update.c
@@ -1,7 +1,7 @@
 /*!
  * \file db/dbmi_driver/d_update.c
  *
- * \brief DBMI Library (driver) - update statemets
+ * \brief DBMI Library (driver) - update statements
  *
  * (C) 1999-2008 by the GRASS Development Team
  *
diff --git a/lib/db/sqlp/README b/lib/db/sqlp/README
deleted file mode 100644
index 9a23b0925e8..00000000000
--- a/lib/db/sqlp/README
+++ /dev/null
@@ -1,18 +0,0 @@
-sqlp is SQL parser library
-
-sqp is intended as library for simple dbmi drivers (like dbf, txt).
-yac.y and lex.l was originally stolen from unixODBC 3/2001 and modified.
-
-An input may be subset of SQL statements. Currently supported:
-SELECT FROM WHERE
-INSERT INTO
-UPDATE WHERE
-DELETE FROM WHERE
-CREATE TABLE
-DROP TABLE
-[...]
-
-New types have to be added in yac.y, lex.l, print.c and
-../../../include/sqlp.h .
-In ./test/ is a test program to the the SQL parser (see
-README there).
diff --git a/lib/db/sqlp/README.md b/lib/db/sqlp/README.md
new file mode 100644
index 00000000000..852126fb157
--- /dev/null
+++ b/lib/db/sqlp/README.md
@@ -0,0 +1,24 @@
+## SQL parser library
+
+sqlp is the SQL parser library.
+
+sqp is intended as library for simple dbmi drivers (like dbf, txt).
+`yac.y` and `lex.l` was originally stolen from unixODBC 3/2001 and modified.
+
+An input may be subset of SQL statements. Currently supported:
+
+```sql
+SELECT FROM WHERE
+INSERT INTO
+UPDATE WHERE
+DELETE FROM WHERE
+CREATE TABLE
+DROP TABLE
+[...]
+```
+
+New types have to be added in `yac.y`, `lex.l`, `print.c` and
+`../../../include/sqlp.h`.
+
+In `./test/` is a test program to the the SQL parser (see
+README.md there).
diff --git a/lib/db/sqlp/sql.html b/lib/db/sqlp/sql.html
index 1a87e179f79..5a4e162c32a 100644
--- a/lib/db/sqlp/sql.html
+++ b/lib/db/sqlp/sql.html
@@ -3148,19 +3148,19 @@ <h2>Database drivers</h2>
 <p>
 <table class="border">
 <tr><td><a href="grass-sqlite.html">sqlite</a></td><td>Data storage in SQLite database files (default DB backend)</td>
-<td><a href="http://sqlite.org/">http://sqlite.org/</a></td></tr>
+<td><a href="https://sqlite.org/">https://sqlite.org/</a></td></tr>
 
 <tr><td><a href="grass-dbf.html">dbf</a></td><td>Data storage in DBF files</td>
 <td><a href="http://shapelib.maptools.org/dbf_api.html">http://shapelib.maptools.org/dbf_api.html</a></td></tr>
 
 <tr><td><a href="grass-pg.html">pg</a></td><td>Data storage in PostgreSQL RDBMS</td>
-<td><a href="http://postgresql.org/">http://postgresql.org/</a></td></tr>
+<td><a href="https://postgresql.org/">https://postgresql.org/</a></td></tr>
 
 <tr><td><a href="grass-mysql.html">mysql</a></td><td>Data storage in MySQL RDBMS</td>
-<td><a href="http://mysql.org/">http://mysql.org/</a></td></tr>
+<td><a href="https://www.mysql.org/">https://www.mysql.org/</a></td></tr>
 <!--
 <tr><td><a href="grass-mesql.html">mesql</a></td><td>Data are stored in MySQL embedded database</td>
-<td><a href="http://mysql.org/">http://mysql.org/</a></td></tr>
+<td><a href="https://www.mysql.org/">https://www.mysql.org/</a></td></tr>
 -->
 <tr><td><a href="grass-odbc.html">odbc</a></td><td>Data storage via UnixODBC (PostgreSQL, Oracle, etc.)</td>
 <td><a href="https://www.unixodbc.org/">https://www.unixodbc.org/</a></td></tr>
@@ -3356,4 +3356,4 @@ <h2>SEE ALSO</h2>
 
 <h2>AUTHOR</h2>
 
-Radmin Blazek
+Radim Blazek
diff --git a/lib/db/sqlp/test/README b/lib/db/sqlp/test/README
deleted file mode 100644
index d703f03bd0c..00000000000
--- a/lib/db/sqlp/test/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Test of sql parser library.
-
-sqlptest reads sql statements (one per row) from standard
-input and writes results of parser to standard output.
-
-Some test statemets are in ./test
diff --git a/lib/db/sqlp/test/README.md b/lib/db/sqlp/test/README.md
new file mode 100644
index 00000000000..a6aae0fe947
--- /dev/null
+++ b/lib/db/sqlp/test/README.md
@@ -0,0 +1,6 @@
+## Test of SQL parser library
+
+`sqlptest` reads SQL statements (one per row) from standard
+input and writes results of parser to standard output.
+
+Some test statements are in `./test`.
diff --git a/lib/htmldriver/htmldriver.html b/lib/htmldriver/htmldriver.html
index 3e14f240805..3ed24c7662d 100644
--- a/lib/htmldriver/htmldriver.html
+++ b/lib/htmldriver/htmldriver.html
@@ -185,7 +185,9 @@ <h2>SEE ALSO</h2>
   <a href="pngdriver.html">PNG driver</a>,
   <a href="htmldriver.html">HTML driver</a>,
   <a href="variables.html">variables</a>
-  <br><br>
+</em>
+<br><br>
+<em>
   <a href="d.rast.html">d.rast</a>,
   <a href="d.vect.html">d.vect</a>,
   <a href="d.mon.html">d.mon</a>,
diff --git a/lib/pngdriver/pngdriver.html b/lib/pngdriver/pngdriver.html
index d0eab9f4125..1b1f6b2a2cb 100644
--- a/lib/pngdriver/pngdriver.html
+++ b/lib/pngdriver/pngdriver.html
@@ -99,7 +99,9 @@ <h2>SEE ALSO</h2>
   <a href="psdriver.html">PS driver</a>,
   <a href="htmldriver.html">HTML driver</a>,
   <a href="variables.html">variables</a>
-  <br><br>
+</em>
+<br><br>
+<em>
   <a href="d.rast.html">d.rast</a>,
   <a href="d.vect.html">d.vect</a>,
   <a href="d.mon.html">d.mon</a>,
diff --git a/lib/psdriver/psdriver.html b/lib/psdriver/psdriver.html
index 3cc9bf7404f..31af82fae88 100644
--- a/lib/psdriver/psdriver.html
+++ b/lib/psdriver/psdriver.html
@@ -85,7 +85,9 @@ <h2>SEE ALSO</h2>
   <a href="pngdriver.html">PNG driver</a>,
   <a href="htmldriver.html">HTML driver</a>,
   <a href="variables.html">variables</a>
-  <br><br>
+</em>
+<br><br>
+<em>
   <a href="d.rast.html">d.rast</a>,
   <a href="d.vect.html">d.vect</a>,
   <a href="d.mon.html">d.mon</a>,
diff --git a/locale/po/grassmods_ar.po b/locale/po/grassmods_ar.po
index 60a7f049caf..25039e2b8e3 100644
--- a/locale/po/grassmods_ar.po
+++ b/locale/po/grassmods_ar.po
@@ -35230,7 +35230,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40743,7 +40743,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -51689,7 +51689,7 @@ msgstr "كتابة ملف جديد...\n"
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_bn.po b/locale/po/grassmods_bn.po
index 601019b62e5..0d9bbd5bdad 100644
--- a/locale/po/grassmods_bn.po
+++ b/locale/po/grassmods_bn.po
@@ -32646,7 +32646,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37639,7 +37639,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47629,7 +47629,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_cs.po b/locale/po/grassmods_cs.po
index 20092289b64..2a8cb9ec9a2 100644
--- a/locale/po/grassmods_cs.po
+++ b/locale/po/grassmods_cs.po
@@ -36067,7 +36067,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -41397,7 +41397,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -52424,7 +52424,7 @@ msgstr "Exportují se prvky s kategorií..."
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_de.po b/locale/po/grassmods_de.po
index 2d98efdafc6..0770a7c2b4c 100644
--- a/locale/po/grassmods_de.po
+++ b/locale/po/grassmods_de.po
@@ -71993,7 +71993,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -87555,7 +87555,7 @@ msgstr ""
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Löst Grenzen zwischen benachbarten Flächen mit gleicher Kategorienummer oder "
@@ -137400,7 +137400,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_el.po b/locale/po/grassmods_el.po
index b74f963adfd..5b471a1996d 100644
--- a/locale/po/grassmods_el.po
+++ b/locale/po/grassmods_el.po
@@ -32820,7 +32820,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37938,7 +37938,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -48176,7 +48176,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_es.po b/locale/po/grassmods_es.po
index 67e3ebc984e..acceca6cee9 100644
--- a/locale/po/grassmods_es.po
+++ b/locale/po/grassmods_es.po
@@ -37113,7 +37113,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -42648,7 +42648,7 @@ msgstr ""
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Disuelve contornos entre áreas adyacentes que comparten un número de "
@@ -56984,7 +56984,7 @@ msgstr "Conviritiendo reglas de color en categorías..."
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_fi.po b/locale/po/grassmods_fi.po
index 65de5b2a888..6063e148619 100644
--- a/locale/po/grassmods_fi.po
+++ b/locale/po/grassmods_fi.po
@@ -32664,7 +32664,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37662,7 +37662,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -48745,7 +48745,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_fr.po b/locale/po/grassmods_fr.po
index a89f981aee3..f9c6d1efb97 100644
--- a/locale/po/grassmods_fr.po
+++ b/locale/po/grassmods_fr.po
@@ -36499,7 +36499,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -41997,7 +41997,7 @@ msgstr ""
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Fusionne des contours entre surfaces adjacentes partageant un attribut ou "
@@ -55188,7 +55188,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_hu.po b/locale/po/grassmods_hu.po
index 036e83cee40..17a63f8ac9b 100644
--- a/locale/po/grassmods_hu.po
+++ b/locale/po/grassmods_hu.po
@@ -32714,7 +32714,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37770,7 +37770,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47898,7 +47898,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_id_ID.po b/locale/po/grassmods_id_ID.po
index fca24fa057e..be7755ff3c7 100644
--- a/locale/po/grassmods_id_ID.po
+++ b/locale/po/grassmods_id_ID.po
@@ -32626,7 +32626,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37619,7 +37619,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47609,7 +47609,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_it.po b/locale/po/grassmods_it.po
index e125eb81e3a..51023ce37bb 100644
--- a/locale/po/grassmods_it.po
+++ b/locale/po/grassmods_it.po
@@ -35246,7 +35246,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40574,7 +40574,7 @@ msgstr ""
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Dissolve i confini tra aree adiacenti che condividono categorie o attributi "
@@ -53528,7 +53528,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_ja.po b/locale/po/grassmods_ja.po
index 78595685d63..06f16964138 100644
--- a/locale/po/grassmods_ja.po
+++ b/locale/po/grassmods_ja.po
@@ -34731,7 +34731,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40022,7 +40022,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -53254,7 +53254,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_ko.po b/locale/po/grassmods_ko.po
index abc9e124ad3..65a0773996e 100644
--- a/locale/po/grassmods_ko.po
+++ b/locale/po/grassmods_ko.po
@@ -34287,7 +34287,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -39517,7 +39517,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -52669,7 +52669,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_lv.po b/locale/po/grassmods_lv.po
index a0f42b59472..4eb28896e23 100644
--- a/locale/po/grassmods_lv.po
+++ b/locale/po/grassmods_lv.po
@@ -33073,7 +33073,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -38284,7 +38284,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -48739,7 +48739,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_ml.po b/locale/po/grassmods_ml.po
index 1da0145392c..33a20bafabf 100644
--- a/locale/po/grassmods_ml.po
+++ b/locale/po/grassmods_ml.po
@@ -32646,7 +32646,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37639,7 +37639,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47629,7 +47629,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_pl.po b/locale/po/grassmods_pl.po
index cbd6fdca652..75c467c28b1 100644
--- a/locale/po/grassmods_pl.po
+++ b/locale/po/grassmods_pl.po
@@ -34832,7 +34832,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40120,7 +40120,7 @@ msgstr ""
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Usuwa granice pomiędzy sąsiadującymi obszarami o tej samej kategorii lub "
@@ -51896,7 +51896,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_pt.po b/locale/po/grassmods_pt.po
index b196346943d..6a54cfe4f55 100644
--- a/locale/po/grassmods_pt.po
+++ b/locale/po/grassmods_pt.po
@@ -34640,7 +34640,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -39870,7 +39870,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -50286,7 +50286,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_pt_BR.po b/locale/po/grassmods_pt_BR.po
index 6b1b3189e71..1ee5ea554a1 100644
--- a/locale/po/grassmods_pt_BR.po
+++ b/locale/po/grassmods_pt_BR.po
@@ -46133,7 +46133,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -51832,7 +51832,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -68292,7 +68292,7 @@ msgstr "Convertendo regras de cores em categorias..."
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_ro.po b/locale/po/grassmods_ro.po
index ac6fea60293..d3692a3f91e 100644
--- a/locale/po/grassmods_ro.po
+++ b/locale/po/grassmods_ro.po
@@ -34839,7 +34839,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40043,7 +40043,7 @@ msgstr ""
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Se dizolvă limitele dintre arealele adiacente un număr comun de categorii "
@@ -52052,7 +52052,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_ru.po b/locale/po/grassmods_ru.po
index 4179f51c7b5..19e2d2ec94e 100644
--- a/locale/po/grassmods_ru.po
+++ b/locale/po/grassmods_ru.po
@@ -32900,7 +32900,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -38055,7 +38055,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -48284,7 +48284,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_si.po b/locale/po/grassmods_si.po
index 68042ebe33a..442bb49b94a 100644
--- a/locale/po/grassmods_si.po
+++ b/locale/po/grassmods_si.po
@@ -32646,7 +32646,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37639,7 +37639,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47629,7 +47629,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_sl.po b/locale/po/grassmods_sl.po
index 362d198e19a..0256f378672 100644
--- a/locale/po/grassmods_sl.po
+++ b/locale/po/grassmods_sl.po
@@ -35453,7 +35453,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40975,7 +40975,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -51966,7 +51966,7 @@ msgstr "Uporabljam koordinate središča sloja\n"
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_ta.po b/locale/po/grassmods_ta.po
index 5042f6a2f30..f4dd6e7a968 100644
--- a/locale/po/grassmods_ta.po
+++ b/locale/po/grassmods_ta.po
@@ -32662,7 +32662,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37669,7 +37669,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47684,7 +47684,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_th.po b/locale/po/grassmods_th.po
index 6e976e3c3f7..a451d354e20 100644
--- a/locale/po/grassmods_th.po
+++ b/locale/po/grassmods_th.po
@@ -32774,7 +32774,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37894,7 +37894,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -48103,7 +48103,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_tr.po b/locale/po/grassmods_tr.po
index 92649ecaa66..f9ea0b78242 100644
--- a/locale/po/grassmods_tr.po
+++ b/locale/po/grassmods_tr.po
@@ -35607,7 +35607,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40874,7 +40874,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -51400,7 +51400,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_uk.po b/locale/po/grassmods_uk.po
index 257e00920c2..2a6ddbe603d 100644
--- a/locale/po/grassmods_uk.po
+++ b/locale/po/grassmods_uk.po
@@ -32686,7 +32686,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37679,7 +37679,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47669,7 +47669,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_vi.po b/locale/po/grassmods_vi.po
index 61e1967fe0e..191db570e48 100644
--- a/locale/po/grassmods_vi.po
+++ b/locale/po/grassmods_vi.po
@@ -32777,7 +32777,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37924,7 +37924,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -48138,7 +48138,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_zh.po b/locale/po/grassmods_zh.po
index 4924b8f67cb..c7ec074034d 100644
--- a/locale/po/grassmods_zh.po
+++ b/locale/po/grassmods_zh.po
@@ -35468,7 +35468,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -40687,7 +40687,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -51101,7 +51101,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grassmods_zh_CN.po b/locale/po/grassmods_zh_CN.po
index 836659c4b54..df3158b8b0e 100644
--- a/locale/po/grassmods_zh_CN.po
+++ b/locale/po/grassmods_zh_CN.po
@@ -32627,7 +32627,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -37620,7 +37620,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -47610,7 +47610,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/po/grasswxpy_ar.po b/locale/po/grasswxpy_ar.po
index 00ce2d0779c..0d34ccd8b13 100644
--- a/locale/po/grasswxpy_ar.po
+++ b/locale/po/grasswxpy_ar.po
@@ -31899,7 +31899,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_bn.po b/locale/po/grasswxpy_bn.po
index 87255b43d43..2af2a217fdb 100644
--- a/locale/po/grasswxpy_bn.po
+++ b/locale/po/grasswxpy_bn.po
@@ -7576,7 +7576,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_cs.po b/locale/po/grasswxpy_cs.po
index 923cddfeb77..e0c6b26edb0 100644
--- a/locale/po/grasswxpy_cs.po
+++ b/locale/po/grasswxpy_cs.po
@@ -7757,7 +7757,7 @@ msgstr "Rozloží společné hranice "
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Rozloží hranice mezi sousedícími plochami, sdílejícími společné číslo "
diff --git a/locale/po/grasswxpy_el.po b/locale/po/grasswxpy_el.po
index f817113410d..51540eee69c 100644
--- a/locale/po/grasswxpy_el.po
+++ b/locale/po/grasswxpy_el.po
@@ -21826,7 +21826,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_es.po b/locale/po/grasswxpy_es.po
index 4cf6d0b0841..21ddd178ade 100644
--- a/locale/po/grasswxpy_es.po
+++ b/locale/po/grasswxpy_es.po
@@ -9845,7 +9845,7 @@ msgstr "Disolver contornos"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Disuelve contornos entre áreas adyacentes que comparten un número de "
diff --git a/locale/po/grasswxpy_fi.po b/locale/po/grasswxpy_fi.po
index 759099bf9fc..d1890afbf1c 100644
--- a/locale/po/grasswxpy_fi.po
+++ b/locale/po/grasswxpy_fi.po
@@ -7592,7 +7592,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_fr.po b/locale/po/grasswxpy_fr.po
index 862c0449ba3..d0407077bd5 100644
--- a/locale/po/grasswxpy_fr.po
+++ b/locale/po/grasswxpy_fr.po
@@ -8108,7 +8108,7 @@ msgstr "Fusionner des contours"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Fusionne des contours entre surfaces adjacentes partageant un attribut ou "
@@ -60110,6 +60110,7 @@ msgstr "étiquettes :"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60625,6 +60626,11 @@ msgstr "outils pris en charge uniquement"
 >>>>>>> b1d91344aa (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> a5a2fa0841 (wxpyimgview: explicit conversion to int (#2704))
+=======
+msgid "supported tools only"
+msgstr "outils pris en charge uniquement"
+
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 #~ msgid "Location Name:"
 #~ msgstr "Nom du secteur : "
 
@@ -73831,6 +73837,7 @@ msgstr "Utilitaire de requêtes SQL"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 960ecd077b (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -76691,3 +76698,5 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné"
 >>>>>>> de41c5c11e (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 146be9abe9 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> d3f362186e (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
diff --git a/locale/po/grasswxpy_hu.po b/locale/po/grasswxpy_hu.po
index 84ad770367d..c01ed11e0d9 100644
--- a/locale/po/grasswxpy_hu.po
+++ b/locale/po/grasswxpy_hu.po
@@ -7715,7 +7715,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_id_ID.po b/locale/po/grasswxpy_id_ID.po
index 1d605c9e765..55e6429cd65 100644
--- a/locale/po/grasswxpy_id_ID.po
+++ b/locale/po/grasswxpy_id_ID.po
@@ -7571,7 +7571,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_it.po b/locale/po/grasswxpy_it.po
index 24168110d7f..b95fe4ac206 100644
--- a/locale/po/grasswxpy_it.po
+++ b/locale/po/grasswxpy_it.po
@@ -11434,7 +11434,7 @@ msgstr "Dissolvi confini"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Dissolve i confini tra aree adiacenti che condividono categorie o attributi "
diff --git a/locale/po/grasswxpy_ja.po b/locale/po/grasswxpy_ja.po
index e1e506a1933..2d45ed3233b 100644
--- a/locale/po/grasswxpy_ja.po
+++ b/locale/po/grasswxpy_ja.po
@@ -7723,7 +7723,7 @@ msgstr "境界の融合"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr "共通のカテゴリー番号や属性を共有するエリアを融合させる"
 
diff --git a/locale/po/grasswxpy_ko.po b/locale/po/grasswxpy_ko.po
index 14aae8e5280..8846b2dba3c 100644
--- a/locale/po/grasswxpy_ko.po
+++ b/locale/po/grasswxpy_ko.po
@@ -14664,7 +14664,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_lv.po b/locale/po/grasswxpy_lv.po
index 2e9704a1a3d..8923849de66 100644
--- a/locale/po/grasswxpy_lv.po
+++ b/locale/po/grasswxpy_lv.po
@@ -7710,7 +7710,7 @@ msgstr "Izšķīdināt robežas"
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_ml.po b/locale/po/grasswxpy_ml.po
index 8ba1cb798dc..8d585db29e2 100644
--- a/locale/po/grasswxpy_ml.po
+++ b/locale/po/grasswxpy_ml.po
@@ -17591,7 +17591,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_pl.po b/locale/po/grasswxpy_pl.po
index 10f88ba1257..311bb956523 100644
--- a/locale/po/grasswxpy_pl.po
+++ b/locale/po/grasswxpy_pl.po
@@ -17126,7 +17126,7 @@ msgstr "Granice regionu"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Usuwa granice pomiędzy sąsiadującymi obszarami o tej samej kategorii lub "
diff --git a/locale/po/grasswxpy_pt.po b/locale/po/grasswxpy_pt.po
index 960d87972eb..5ac64cc64f0 100644
--- a/locale/po/grasswxpy_pt.po
+++ b/locale/po/grasswxpy_pt.po
@@ -7628,7 +7628,7 @@ msgstr "Dissolver fronteiras/contornos"
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_pt_BR.po b/locale/po/grasswxpy_pt_BR.po
index a2aefc2ebe7..4a00b30c965 100644
--- a/locale/po/grasswxpy_pt_BR.po
+++ b/locale/po/grasswxpy_pt_BR.po
@@ -108019,7 +108019,7 @@ msgstr "Dissolver fronteiras"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Dissolve fronteiras entre áreas adjacentes que compartilham um número de "
diff --git a/locale/po/grasswxpy_ro.po b/locale/po/grasswxpy_ro.po
index cd9a6745889..fb9ec014fd7 100644
--- a/locale/po/grasswxpy_ro.po
+++ b/locale/po/grasswxpy_ro.po
@@ -7799,7 +7799,7 @@ msgstr "Dizolvă limitele"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Se dizolvă limitele dintre arealele adiacente un număr comun de categorii "
diff --git a/locale/po/grasswxpy_ru.po b/locale/po/grasswxpy_ru.po
index 831836e0b6a..7f6d53325d4 100644
--- a/locale/po/grasswxpy_ru.po
+++ b/locale/po/grasswxpy_ru.po
@@ -60817,7 +60817,7 @@ msgstr "Удаление границ"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Удаляет границы между смежными полигонами с одинаковым номером категории или "
diff --git a/locale/po/grasswxpy_si.po b/locale/po/grasswxpy_si.po
index a64af7d6db7..f504fa72fac 100644
--- a/locale/po/grasswxpy_si.po
+++ b/locale/po/grasswxpy_si.po
@@ -7570,7 +7570,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_sl.po b/locale/po/grasswxpy_sl.po
index ed7fcfede36..65432e4c1c4 100644
--- a/locale/po/grasswxpy_sl.po
+++ b/locale/po/grasswxpy_sl.po
@@ -31899,7 +31899,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_ta.po b/locale/po/grasswxpy_ta.po
index 79ddd570068..1c4c08b04f9 100644
--- a/locale/po/grasswxpy_ta.po
+++ b/locale/po/grasswxpy_ta.po
@@ -7580,7 +7580,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_th.po b/locale/po/grasswxpy_th.po
index abf6970aab3..7003a0fd655 100644
--- a/locale/po/grasswxpy_th.po
+++ b/locale/po/grasswxpy_th.po
@@ -7598,7 +7598,7 @@ msgstr "ละลาย ขอบเขต"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr "Dissolves เขต ระหว่าง พื้นที่ที่อยู่ติดกันและมี ข้อมูลเหมือนกัน"
 
diff --git a/locale/po/grasswxpy_tr.po b/locale/po/grasswxpy_tr.po
index ec35978bf97..1610607da2a 100644
--- a/locale/po/grasswxpy_tr.po
+++ b/locale/po/grasswxpy_tr.po
@@ -25421,7 +25421,7 @@ msgstr "Sınırları çöz"
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 #, fuzzy
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 "Ortak kategori numarası veya özniteliği paylaşan komşu alanlar arasındaki "
diff --git a/locale/po/grasswxpy_uk.po b/locale/po/grasswxpy_uk.po
index f53d4f248b1..b6437b712e6 100644
--- a/locale/po/grasswxpy_uk.po
+++ b/locale/po/grasswxpy_uk.po
@@ -7571,7 +7571,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_vi.po b/locale/po/grasswxpy_vi.po
index 88f764504d1..1e2c2c00452 100644
--- a/locale/po/grasswxpy_vi.po
+++ b/locale/po/grasswxpy_vi.po
@@ -7581,7 +7581,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_zh.po b/locale/po/grasswxpy_zh.po
index ca8cdab7aeb..19bce5aadc7 100644
--- a/locale/po/grasswxpy_zh.po
+++ b/locale/po/grasswxpy_zh.po
@@ -42712,7 +42712,7 @@ msgstr "边界融合"
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/po/grasswxpy_zh_CN.po b/locale/po/grasswxpy_zh_CN.po
index 58487d8b604..a329aeb5bf1 100644
--- a/locale/po/grasswxpy_zh_CN.po
+++ b/locale/po/grasswxpy_zh_CN.po
@@ -7571,7 +7571,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/locale/templates/grassmods.pot b/locale/templates/grassmods.pot
index 530d7ddef3b..733c484efae 100644
--- a/locale/templates/grassmods.pot
+++ b/locale/templates/grassmods.pot
@@ -168373,7 +168373,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.what.spoly_to_translate.c:1
 msgid ""
-"Queries vector map with overlaping \"spaghetti\" polygons (e.g. Landsat "
+"Queries vector map with overlapping \"spaghetti\" polygons (e.g. Landsat "
 "footprints) at given location. Polygons must have not intersected boundaries."
 msgstr ""
 
@@ -206684,7 +206684,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.dissolve_to_translate.c:1
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
@@ -289126,7 +289126,7 @@ msgstr ""
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:85
 msgid ""
-"Colum with categories. If selected, a separate ellipse will be drawn for "
+"Column with categories. If selected, a separate ellipse will be drawn for "
 "each group/category"
 msgstr ""
 
diff --git a/locale/templates/grasswxpy.pot b/locale/templates/grasswxpy.pot
index 8d9d1856698..f7c8b0eec2b 100644
--- a/locale/templates/grasswxpy.pot
+++ b/locale/templates/grasswxpy.pot
@@ -31900,7 +31900,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537
 msgid ""
-"Dissolves adjacent or overlaping features sharing a common category number "
+"Dissolves adjacent or overlapping features sharing a common category number "
 "or attribute."
 msgstr ""
 
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index 0c39667e50e..2276f6a07c3 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -125,6 +125,7 @@ DLLS="
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 68f959884d (Merge branch 'a0x8o' into stag0)
@@ -1178,6 +1179,8 @@ DLLS="
 	/mingw64/bin/libbrotlidec.dll
 >>>>>>> a258a6de0c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 	/mingw64/bin/libbrotlicommon.dll
 	/mingw64/bin/libbrotlidec.dll
 	/mingw64/bin/libbz2-1.dll
@@ -1193,6 +1196,7 @@ DLLS="
 	/mingw64/bin/libharfbuzz-0.dll
 	/mingw64/bin/libiconv-2.dll
 	/mingw64/bin/libintl-8.dll
+<<<<<<< HEAD
 	/mingw64/bin/liblapack.dll
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1526,6 +1530,8 @@ DLLS="
 =======
 >>>>>>> osgeo-main
 =======
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 	/mingw64/bin/libpcre-1.dll
 	/mingw64/bin/libpixman-1-0.dll
 	/mingw64/bin/libpng16-16.dll
@@ -1655,6 +1661,7 @@ DLLS="
 	/mingw64/bin/libwinpthread-1.dll
 	/mingw64/bin/zlib1.dll
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 88cfd0573d (style: Sort package lists, configure options, and other various sortable files (#4563))
 =======
   /mingw64/bin/libopenblas.dll
@@ -2242,6 +2249,9 @@ DLLS="
 >>>>>>> 88cfd0573d (style: Sort package lists, configure options, and other various sortable files (#4563))
 >>>>>>> 358e3de0db (style: Sort package lists, configure options, and other various sortable files (#4563))
 >>>>>>> 869f8c65fb (style: Sort package lists, configure options, and other various sortable files (#4563))
+=======
+  /mingw64/bin/libopenblas.dll
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 "
 
 if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
@@ -3172,7 +3182,6 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 		--with-geos=$PWD/mswindows/osgeo4w/geos-config \
 		--with-includes=$OSGEO4W_ROOT_MSYS/include \
 		--with-lapack \
-		--with-lapack-includes=/mingw64/include \
 		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config \
 		--with-libs="$OSGEO4W_ROOT_MSYS/lib" \
 		--with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
diff --git a/pyproject.toml b/pyproject.toml
index 5a64f8791dd..2e3d4bebf7b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6720,6 +6720,7 @@ exclude = '''
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 required-version = ">=0.6.0"
 =======
 required-version = ">=0.5.0"
@@ -6737,6 +6738,9 @@ required-version = ">=0.5.0"
 >>>>>>> deff63f816 (checks(ruff): Configure ruff linter (#3972))
 >>>>>>> bb75228712 (checks(ruff): Configure ruff linter (#3972))
 >>>>>>> d77766906a (checks(ruff): Configure ruff linter (#3972))
+=======
+required-version = ">=0.8.0"
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 
 builtins = ["_"]
 
@@ -7157,6 +7161,7 @@ ignore = [
     "PLW3201", # bad-dunder-method-name
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> d77766906a (checks(ruff): Configure ruff linter (#3972))
@@ -7177,6 +7182,8 @@ ignore = [
 =======
 >>>>>>> bb75228712 (checks(ruff): Configure ruff linter (#3972))
 >>>>>>> d77766906a (checks(ruff): Configure ruff linter (#3972))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     "PTH100",  # os-path-abspath
     "PTH101",  # os-chmod
     "PTH102",  # os-mkdir
@@ -7471,11 +7478,14 @@ ignore = [
 "lib/init/grass.py" = ["SIM115"]
 "locale/grass_po_stats.py" = ["SIM115"]
 <<<<<<< HEAD
+<<<<<<< HEAD
 "man/build_*.py" = ["SIM115"]
 "man/parser_standard_options.py" = ["SIM115"]
 >>>>>>> osgeo-main
 =======
 >>>>>>> 6c45ad9cf2 (man: Use a context manager for opening files (#4291))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 "python/grass/__init__.py" = ["PYI056"]
 "python/grass/exp*/tests/grass_script_mapset_session_test.py" = ["SIM117"]
 "python/grass/exp*/tests/grass_script_tmp_mapset_session_test.py" = ["SIM117"]
diff --git a/python/grass/script/__init__.py b/python/grass/script/__init__.py
index fd5a229fc6d..b72f4c3efc2 100644
--- a/python/grass/script/__init__.py
+++ b/python/grass/script/__init__.py
@@ -1,6 +1,7 @@
 """Python interface to launch GRASS GIS modules in scripts
 """
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 from .core import *
@@ -21,6 +22,8 @@
 =======
 =======
 >>>>>>> 3ac340cfe2 (Merge branch 'a0x8o' into stag0)
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 from . import setup
 from .core import (
     PIPE,
@@ -226,6 +229,7 @@
     "write_command",
 ]
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 602118adcc (init: Fix F401 Linter Warnings by Replacing Wildcard Imports with Explicit Imports in   __init__.py (#4647))
 =======
 =======
@@ -252,3 +256,5 @@
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 25c9f12c84 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 4217d7b0d6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
diff --git a/python/grass/temporal/c_libraries_interface.py b/python/grass/temporal/c_libraries_interface.py
index 08b85610c8d..71d39135d84 100644
--- a/python/grass/temporal/c_libraries_interface.py
+++ b/python/grass/temporal/c_libraries_interface.py
@@ -5387,6 +5387,9 @@
     from multiprocessing.synchronize import _LockLike
 >>>>>>> c864d02248 (python: Add typing to RPC server and Messenger (#4639))
 
+
+logger = logging.getLogger(__name__)
+
 ###############################################################################
 
 
@@ -13566,6 +13569,7 @@ def _read_semantic_label(lock, conn, data):
 =======
 >>>>>>> 173e44f2dc (libpython: Save and load benchmark results (#1711))
         else:
+<<<<<<< HEAD
             logging.error(
 <<<<<<< HEAD
                 "Unable to read semantic label. Unsupported map type {maptype}",
@@ -15149,6 +15153,11 @@ def _read_semantic_label(lock, conn, data):
 >>>>>>> 2157ee3930 (style: Fix python logging-related pylint and ruff warnings (#3998))
 >>>>>>> b297e0cc69 (style: Fix python logging-related pylint and ruff warnings (#3998))
 >>>>>>> 37d5acc083 (style: Fix python logging-related pylint and ruff warnings (#3998))
+=======
+            logger.error(
+                "Unable to read semantic label. Unsupported map type %(maptype)s",
+                {"maptype": maptype},
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
             )
             return -1
     finally:
@@ -21862,6 +21871,7 @@ def _write_semantic_label(lock, conn, data):
 =======
 >>>>>>> 173e44f2dc (libpython: Save and load benchmark results (#1711))
         else:
+<<<<<<< HEAD
             logging.error(
 <<<<<<< HEAD
                 "Unable to write semantic label. Unsupported map type {maptype}",
@@ -23589,6 +23599,11 @@ def _write_semantic_label(lock, conn, data):
 >>>>>>> 2157ee3930 (style: Fix python logging-related pylint and ruff warnings (#3998))
 >>>>>>> b297e0cc69 (style: Fix python logging-related pylint and ruff warnings (#3998))
 >>>>>>> 37d5acc083 (style: Fix python logging-related pylint and ruff warnings (#3998))
+=======
+            logger.error(
+                "Unable to write semantic label. Unsupported map type %(maptype)s",
+                {"maptype": maptype},
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
             )
             return -2
     finally:
@@ -26823,6 +26838,7 @@ def _remove_semantic_label(lock, conn, data):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 90e8567102 (wxpyimgview: explicit conversion to int (#2704))
         else:
+<<<<<<< HEAD
             logging.error(
 <<<<<<< HEAD
                 "Unable to remove semantic label. Unsupported map type {maptype}",
@@ -28037,6 +28053,11 @@ def _remove_semantic_label(lock, conn, data):
 >>>>>>> 2157ee3930 (style: Fix python logging-related pylint and ruff warnings (#3998))
 >>>>>>> b297e0cc69 (style: Fix python logging-related pylint and ruff warnings (#3998))
 >>>>>>> 37d5acc083 (style: Fix python logging-related pylint and ruff warnings (#3998))
+=======
+            logger.error(
+                "Unable to remove semantic label. Unsupported map type %(maptype)s",
+                {"maptype": maptype},
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
             )
             return -2
     finally:
@@ -28275,6 +28296,7 @@ def _read_raster_info(name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             logging.warning(_("Raster range file is empty"))
 =======
@@ -30294,6 +30316,9 @@ def _read_raster_info(name, mapset):
 >>>>>>> de41c5c11e (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 146be9abe9 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> d3f362186e (wxpyimgview: explicit conversion to int (#2704))
+=======
+            logger.info(_("Raster range file is empty"))
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
             kvp["min"] = None
             kvp["max"] = None
         else:
@@ -30422,6 +30447,7 @@ def _read_raster_info(name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             logging.warning(_("Raster range file is empty"))
 =======
@@ -32441,6 +32467,9 @@ def _read_raster_info(name, mapset):
 >>>>>>> de41c5c11e (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 146be9abe9 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> d3f362186e (wxpyimgview: explicit conversion to int (#2704))
+=======
+            logger.info(_("Raster range file is empty"))
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
             kvp["min"] = None
             kvp["max"] = None
         else:
diff --git a/raster/r.basins.fill/r.basins.fill.html b/raster/r.basins.fill/r.basins.fill.html
index 4f1fc199d86..e06f8f5b777 100644
--- a/raster/r.basins.fill/r.basins.fill.html
+++ b/raster/r.basins.fill/r.basins.fill.html
@@ -22,7 +22,6 @@ <h2>DESCRIPTION</h2>
 If the resulting map layer from this program appears to
 have holes within a subbasin, the program should be
 rerun with a higher number of passes.
-<br><br>
 
 <h2>NOTES</h2>
 
diff --git a/raster/r.horizon/r.horizon.html b/raster/r.horizon/r.horizon.html
index dd4c55af2cf..27a6ddd2f5a 100644
--- a/raster/r.horizon/r.horizon.html
+++ b/raster/r.horizon/r.horizon.html
@@ -1461,7 +1461,7 @@ <h2>DESCRIPTION</h2>
 orientation (North=0, clockwise).
 
 <p>
-Activating the <b>-l</b> flag allows to additionally print the distance
+Activating the <b>-l</b> flag allows additionally printing the distance
 to each horizon angle.
 
 <h3>Input parameters:</h3>
diff --git a/raster/r.texture/r.texture.html b/raster/r.texture/r.texture.html
index 6968a27320c..9dfc8bde7b5 100644
--- a/raster/r.texture/r.texture.html
+++ b/raster/r.texture/r.texture.html
@@ -5184,7 +5184,7 @@ <h3>Performance</h3>
   <br>
   <i>Figure 1: Benchmark shows execution time for different
     number of cells (1M, 2M, 4M, and 8M) and
-    the fixed size of window (3<span>&#215</span>3).
+    the fixed size of window (3<span>&#215;</span>3).
 </div>
 <div align="center" style="margin: 10px">
   <img src="r_texture_mapsize_efficiency.png"
@@ -5192,7 +5192,7 @@ <h3>Performance</h3>
   <br>
   <i>Figure 2: Benchmark shows efficiency for different
     numbers of cells (1M, 2M, 4M, and 8M) and
-    the fixed size of window (3<span>&#215</span>3).
+    the fixed size of window (3<span>&#215;</span>3).
 </div>
 <div align="center" style="margin: 10px">
   <img src="r_texture_window_time.png"
@@ -5200,8 +5200,8 @@ <h3>Performance</h3>
   <br>
   <i>Figure 3: Benchmark shows execution time for different
     sizes of windows
-    (3<span>&#215</span>3, 9<span>&#215</span>9,
-    15<span>&#215</span>15, and 27<span>&#215</span>27)
+    (3<span>&#215;</span>3, 9<span>&#215;</span>9,
+    15<span>&#215;</span>15, and 27<span>&#215;</span>27)
     and the fixed number of cells (1M).
 </div>
 <div align="center" style="margin: 10px">
@@ -5209,8 +5209,8 @@ <h3>Performance</h3>
   alt="efficiency benchmark for r.texture with different window sizes"  border="0">
   <br>
   <i>Figure 4: Benchmark shows efficiency for different
-    sizes of windows (3<span>&#215</span>3, 9<span>&#215</span>9,
-    15<span>&#215</span>15, and 27<span>&#215</span>27)
+    sizes of windows (3<span>&#215;</span>3, 9<span>&#215;</span>9,
+    15<span>&#215;</span>15, and 27<span>&#215;</span>27)
     and the fixed number of cells (1M).
 </div>
 
diff --git a/raster3d/r3.gwflow/r3.gwflow.html b/raster3d/r3.gwflow/r3.gwflow.html
index 7ced5f01ba8..82dca510162 100644
--- a/raster3d/r3.gwflow/r3.gwflow.html
+++ b/raster3d/r3.gwflow/r3.gwflow.html
@@ -4,7 +4,7 @@ <h2>DESCRIPTION</h2>
 confined groundwater flow in three dimensions based on volume maps
 and the current 3D region settings.
 All initial- and boundary-conditions must be provided as volume maps.
-The unit of the current coordinate refernce system must be meters.
+The unit of the current coordinate reference system must be meters.
 <p>This module is sensitive to mask settings. All cells which are outside
 the mask are ignored and handled as no flow boundaries.
 <p>The module calculates the piezometric head and optionally the water
diff --git a/renovate.json5 b/renovate.json5
index 210792f7917..ecc290310ae 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -13,11 +13,11 @@
 =======
 >>>>>>> a1d554657a (style: Apply missing pre-commit fixes (#3834))
 
-        // allows to use comments starting with
+        // allows using comments starting with
         // "# renovate: " to update _VERSION
         // environment variables in GitHub Action files.
         "customManagers:githubActionsVersions",
-        // allows to use comments starting with
+        // allows using comments starting with
         // "# renovate: " to update _VERSION
         // ENV or ARG in a Dockerfile.
         "customManagers:dockerfileVersions",
diff --git a/scripts/v.clip/v.clip.html b/scripts/v.clip/v.clip.html
index b4d93121d9a..17d364d713c 100644
--- a/scripts/v.clip/v.clip.html
+++ b/scripts/v.clip/v.clip.html
@@ -22,7 +22,7 @@ <h2>NOTES</h2>
 and/or lines can be achieved
 using <em><a href="v.overlay.html">v.overlay</a></em>. Clipping of
 points can be performed
-with <em><a href="v.select.html">v.select<a></em>.
+with <em><a href="v.select.html">v.select</a></em>.
 
 <h2>EXAMPLES</h2>
 
diff --git a/scripts/v.dissolve/v.dissolve.py b/scripts/v.dissolve/v.dissolve.py
index 7336833060a..cb03ae3591e 100755
--- a/scripts/v.dissolve/v.dissolve.py
+++ b/scripts/v.dissolve/v.dissolve.py
@@ -16,7 +16,7 @@
 #############################################################################
 
 # %module
-# % description: Dissolves adjacent or overlaping features sharing a common category number or attribute.
+# % description: Dissolves adjacent or overlapping features sharing a common category number or attribute.
 # % keyword: vector
 # % keyword: dissolve
 # % keyword: area
diff --git a/temporal/t.rast.extract/t.rast.extract.html b/temporal/t.rast.extract/t.rast.extract.html
index bc3b0b30f7c..f8e366250e4 100644
--- a/temporal/t.rast.extract/t.rast.extract.html
+++ b/temporal/t.rast.extract/t.rast.extract.html
@@ -27,16 +27,16 @@ <h2>NOTES</h2>
 
 
 <div class="code"><pre>
-t.rast.extract input=tempmean_monthly where="start_time > '2010-01-05'" \
+t.rast.extract input=tempmean_monthly where="start_time &gt; '2010-01-05'" \
                output=selected_tempmean_monthly basename=new_tmean_month \
-               expression="if(tempmean_monthly < 0, null(), tempmean_monthly)"
+               expression="if(tempmean_monthly &lt; 0, null(), tempmean_monthly)"
 </div>
 
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
 t.rast.extract input=tempmean_monthly output=tempmean_monthly_later_2012 \
-               where="start_time >= '2012-01-01'"
+               where="start_time &gt;= '2012-01-01'"
 
 t.rast.list tempmean_monthly_later_2012
 name|mapset|start_time|end_time
diff --git a/vector/v.class/v.class.html b/vector/v.class/v.class.html
index 026f81c7e73..d833975173e 100644
--- a/vector/v.class/v.class.html
+++ b/vector/v.class/v.class.html
@@ -35,19 +35,20 @@ <h2>NOTES</h2>
 are those of the number of breaks asked for.
 
 <p>The <em>discont</em> algorithm systematically searches discontinuities
-in the slope of the cumulated frequencies curve, by approximating this
+in the slope of the cumulative frequencies curve, by approximating this
 curve through straight line segments whose vertices define the class
 breaks. The first approximation is a straight line which links the two
 end nodes of the curve. This line is then replaced by a two-segmented
 polyline whose central node is the point on the curve which is farthest
 from the preceding straight line. The point on the curve furthest from
 this new polyline is then chosen as a new node to create break up one of
-the two preceding segments, and so forth. The problem of the difference
-in terms of units between the two axes is solved by rescaling both
-amplitudes to an interval between 0 and 1. In the original algorithm,
-the process is stopped when the difference between the slopes of the two
-new segments is no longer significant (alpha = 0.05). As the slope is
-the ratio between the frequency and the amplitude of the corresponding
+the two preceding segments, and so forth.
+
+<p>The problem of the difference in terms of units between the two axes 
+is solved by rescaling both amplitudes to an interval between 0 and 1. 
+In the original algorithm, the process is stopped when the difference between 
+the slopes of the two new segments is no longer significant (alpha = 0.05). As 
+the slope is the ratio between the frequency and the amplitude of the corresponding
 interval, i.e. its density, this effectively tests whether the frequencies
 of the two newly proposed classes are different from those obtained by
 simply distributing the sum of their frequencies amongst them in proportion
diff --git a/vector/v.db.select/v.db.select.html b/vector/v.db.select/v.db.select.html
index 5dfd4a40e0b..0eef5220de2 100644
--- a/vector/v.db.select/v.db.select.html
+++ b/vector/v.db.select/v.db.select.html
@@ -929,7 +929,7 @@ <h4>JSON</h4>
 >>>>>>> 4972a560dc (WMS: replace broken URLs with alternative WMS (#1635))
 The JSON also contains information about columns stored under key
 <code>info</code>. Column names and types are under key <code>columns</code>.
-Each colum has SQL data type under <code>sql_type</code> in all caps.
+Each column has SQL data type under <code>sql_type</code> in all caps.
 A boolean <code>is_number</code> specifies whether the value is a number, i.e.,
 integer or floating point number. The <code>is_number</code> value
 is aded for convenience and it is recommended to rely on the types derived
diff --git a/vector/v.net.salesman/v.net.salesman.html b/vector/v.net.salesman/v.net.salesman.html
index 6b29ce0ea88..8c2fc164414 100644
--- a/vector/v.net.salesman/v.net.salesman.html
+++ b/vector/v.net.salesman/v.net.salesman.html
@@ -2717,6 +2717,7 @@ <h2>AUTHORS</h2>
 
 <h3>TURNS SUPPORT</h3>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 The turns support was implemnented as part of GRASS GIS turns cost project
@@ -3470,6 +3471,9 @@ <h3>TURNS SUPPORT</h3>
 =======
 The turns support was implemented as part of GRASS GIS turns cost project
 >>>>>>> 9f09469aef (docs: v.net.salesman.html fix manual typos (#4737))
+=======
+The turns support was implemented as part of GRASS GIS turns cost project
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 at Czech Technical University in Prague, Czech Republic.<br>
 =======
 <<<<<<< HEAD
diff --git a/vector/v.rectify/v.rectify.html b/vector/v.rectify/v.rectify.html
index e33e4986fb2..cc12a7a1abd 100644
--- a/vector/v.rectify/v.rectify.html
+++ b/vector/v.rectify/v.rectify.html
@@ -1442,6 +1442,7 @@ <h3>Coordinate transformation and RMSE</h3>
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8acdfcc471 (docs: v.rectify.html fix typos (#4619))
 If the <b>-r</b> flag is given, <em>v.rectify</em> will calculate the 
@@ -1466,6 +1467,9 @@ <h3>Coordinate transformation and RMSE</h3>
 If the <b>-r</b> flag is given, <em>v.rectify</em> will calculate the 
 >>>>>>> e632f0f0bb (r.horizon manual - fix typo (#2794))
 >>>>>>> c66f377132 (r.horizon manual - fix typo (#2794))
+=======
+If the <b>-r</b> flag is given, <em>v.rectify</em> will calculate the
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 Root Mean Square Error (RMSE) and print out statistics in tabular format.
 The last row gives a summary with the first column holding the number of
 active points, followed by average deviations for each dimension and both
diff --git a/vector/v.surf.rst/v.surf.rst.html b/vector/v.surf.rst/v.surf.rst.html
index 82082aa4465..3c8220e469b 100644
--- a/vector/v.surf.rst/v.surf.rst.html
+++ b/vector/v.surf.rst/v.surf.rst.html
@@ -305,14 +305,14 @@ <h3>Performance</h3>
   <img src="vsurfrst_benchmark.png" alt="benchmark for v.surf.rst" border="0">
   <br>
   <i>Figure 1: Benchmark shows execution time for different
-    number of cells (1M, 2M, 4M, and 8M).
+    number of cells (1M, 2M, 4M, and 8M).</i>
 </div>
 <div align="center" style="margin: 10px">
     <img src="vsurfrst_cv_benchmark.png" alt="benchmark for cross-validation of
      v.surf.rst" border="0">
     <br>
     <i>Figure 2: Benchmark shows execution time for running cross-validation on
-     different number of cells (100k, 200k, 400k, and 800k).
+     different number of cells (100k, 200k, 400k, and 800k).</i>
 </div>
 
 <h2>EXAMPLE</h2>
@@ -355,10 +355,10 @@ <h3>Usage of the where parameter</h3>
 v.db.univar -e elevrand column=value
 
 # interpolation based on subset of points (only those over 1st quartile)
-v.surf.rst input=elevrand zcolumn=value elevation=elev_partial npmin=100 where="value > 94.9"
+v.surf.rst input=elevrand zcolumn=value elevation=elev_partial npmin=100 where="value &gt; 94.9"
 r.colors map=elev_partial raster=elevation
 d.rast elev_partial
-d.vect elevrand where="value > 94.9"
+d.vect elevrand where="value &gt; 94.9"
 </pre></div>
 
 <h2>REFERENCES</h2>