[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-895-g03d46d8ea
git at osgeo.org
git at osgeo.org
Mon May 15 11:45:53 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 03d46d8eaa264ddf310e3a0285dce659bd5da1b7 (commit)
via 4b6b0de917d05520e108de1ea4545ae17ce07a2b (commit)
from 46ebbe834632b320c75c9743795d7c3c0bad7c77 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 03d46d8eaa264ddf310e3a0285dce659bd5da1b7
Author: Sandro Santilli <strk at kbt.io>
Date: Mon May 15 20:45:24 2023 +0200
Fix xml entities in french translation
This was done by running utils/fix_xml_entities.sh
diff --git a/doc/po/fr/extras_historytable.xml.po b/doc/po/fr/extras_historytable.xml.po
index 0380dc768..2443645b6 100644
--- a/doc/po/fr/extras_historytable.xml.po
+++ b/doc/po/fr/extras_historytable.xml.po
@@ -176,8 +176,8 @@ msgid ""
" ( date_deleted >= 'January 1, 2001' OR date_deleted IS NULL );"
msgstr ""
"SELECT * FROM roads_history\n"
-" WHERE date_added < ; 'January 1, 2001' AND\n"
-" ( date_deleted > ;= 'January 1, 2001' OR date_deleted IS NULL ) ;"
+" WHERE date_added < 'January 1, 2001' AND\n"
+" ( date_deleted >= 'January 1, 2001' OR date_deleted IS NULL ) ;"
#. Tag: refname
#: extras_historytable.xml:38
diff --git a/doc/po/fr/reference_accessor.xml.po b/doc/po/fr/reference_accessor.xml.po
index bdc3a60a1..b7fe01537 100644
--- a/doc/po/fr/reference_accessor.xml.po
+++ b/doc/po/fr/reference_accessor.xml.po
@@ -387,7 +387,7 @@ msgstr "&sfs_compliant; OGC SPEC s2.1.1.1"
#: reference_accessor.xml:94
#, no-c-format
msgid "&sqlmm_compliant; SQL-MM IEC 13249-3: 5.1.17"
-msgstr "&sqlmm_compliant ; SQL-MM IEC 13249-3 : 5.1.17"
+msgstr "&sqlmm_compliant; SQL-MM IEC 13249-3 : 5.1.17"
#. Tag: para
#: reference_accessor.xml:96
@@ -2158,7 +2158,7 @@ msgstr "&sfs_compliant; s2.1.1.1"
#: reference_accessor.xml:673
#, no-c-format
msgid "&sqlmm_compliant; SQL-MM 3: 5.1.19"
-msgstr "&sqlmm_compliant ; SQL-MM 3 : 5.1.19"
+msgstr "&sqlmm_compliant; SQL-MM 3 : 5.1.19"
#. Tag: programlisting
#: reference_accessor.xml:679
@@ -2492,7 +2492,7 @@ msgstr ""
"11, 12 11))') )\n"
" )As foo(geom)\n"
" CROSS JOIN generate_series(1,100) n\n"
-"WHERE n < ;= ST_NumGeometries(geom) ;\n"
+"WHERE n <= ST_NumGeometries(geom) ;\n"
"\n"
" n | geomewkt\n"
"---+-----------------------------------------\n"
@@ -2508,7 +2508,7 @@ msgstr ""
"\n"
"SELECT gid, n, ST_GeometryN(geom, n)\n"
"FROM sometable CROSS JOIN generate_series(1,100) n\n"
-"WHERE n < ;= ST_NumGeometries(geom) ;"
+"WHERE n <= ST_NumGeometries(geom) ;"
#. Tag: programlisting
#: reference_accessor.xml:798
@@ -4263,7 +4263,7 @@ msgstr "Disponibilité : 2.0.0"
#: reference_accessor.xml:1680 reference_accessor.xml:1771
#, no-c-format
msgid "&sqlmm_compliant; SQL-MM ISO/IEC 13249-3: 8.5"
-msgstr "&sqlmm_compliant ; SQL-MM ISO/IEC 13249-3 : 8.5"
+msgstr "&sqlmm_compliant; SQL-MM ISO/IEC 13249-3 : 8.5"
#. Tag: programlisting
#: reference_accessor.xml:1687
diff --git a/doc/po/fr/reference_srs.xml.po b/doc/po/fr/reference_srs.xml.po
index 35b9fdb5f..de7db18c8 100644
--- a/doc/po/fr/reference_srs.xml.po
+++ b/doc/po/fr/reference_srs.xml.po
@@ -384,7 +384,7 @@ msgstr "&sfs_compliant; s2.1.1.1"
#: reference_srs.xml:149
#, no-c-format
msgid "&sqlmm_compliant; SQL-MM 3: 5.1.5"
-msgstr "&sqlmm_compliant ; SQL-MM 3 : 5.1.5"
+msgstr "&sqlmm_compliant; SQL-MM 3 : 5.1.5"
#. Tag: programlisting
#: reference_srs.xml:157
diff --git a/doc/po/fr/using_postgis_app.xml.po b/doc/po/fr/using_postgis_app.xml.po
index 72f5ac734..465cbaf04 100644
--- a/doc/po/fr/using_postgis_app.xml.po
+++ b/doc/po/fr/using_postgis_app.xml.po
@@ -233,7 +233,7 @@ msgid ""
msgstr ""
"La connexion à la base de données est régie par une \"chaîne de connexion\" "
"qui est un ensemble standard de clés et de valeurs comme ceci (avec les "
-"valeurs par défaut dans < ;> ;) :"
+"valeurs par défaut dans <>) :"
#. Tag: para
#: using_postgis_app.xml:80
diff --git a/doc/po/fr/using_postgis_query.xml.po b/doc/po/fr/using_postgis_query.xml.po
index 7faa463b5..92547cfa5 100644
--- a/doc/po/fr/using_postgis_query.xml.po
+++ b/doc/po/fr/using_postgis_query.xml.po
@@ -714,7 +714,7 @@ msgstr ""
"SELECT a.id\n"
"FROM roads a, roads b\n"
"WHERE a.id != b.id\n"
-" AND a.geom & ;& ; b.geom\n"
+" AND a.geom && b.geom\n"
" AND ST_Relate(a.geom, b.geom, '1*1***1**') ;"
#. Tag: para
@@ -742,7 +742,7 @@ msgstr ""
"-- Trouver des quais en partie sur les rives d'un lac\n"
"SELECT a.lake_id, b.wharf_id\n"
"FROM lakes a, wharfs b\n"
-"WHERE a.geom & ;& ; b.geom\n"
+"WHERE a.geom && b.geom\n"
" AND ST_Relate(a.geom, b.geom, '102101FF2') ;"
#. Tag: title
commit 4b6b0de917d05520e108de1ea4545ae17ce07a2b
Author: Sandro Santilli <strk at kbt.io>
Date: Mon May 15 20:45:15 2023 +0200
Add script to fix xml entities
diff --git a/utils/fix_xml_entities.sh b/utils/fix_xml_entities.sh
new file mode 100755
index 000000000..883c6a71c
--- /dev/null
+++ b/utils/fix_xml_entities.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd $(dirname $0)/..
+
+perl -CSDL -pi \
+ -e 's/\&([_a-z]*)[\s\h][\s\h]*;/&\1;/g' \
+ $(find doc/po/ -name *.po)
-----------------------------------------------------------------------
Summary of changes:
doc/po/fr/extras_historytable.xml.po | 4 ++--
doc/po/fr/reference_accessor.xml.po | 10 +++++-----
doc/po/fr/reference_srs.xml.po | 2 +-
doc/po/fr/using_postgis_app.xml.po | 2 +-
doc/po/fr/using_postgis_query.xml.po | 4 ++--
utils/fix_xml_entities.sh | 7 +++++++
6 files changed, 18 insertions(+), 11 deletions(-)
create mode 100755 utils/fix_xml_entities.sh
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list