You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/11/15 16:32:24 UTC
(sis) branch geoapi-4.0 updated (7005648d55 -> 1c54d069b5)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
discard 7005648d55 Fix misleading or interchanged localized resources.
new 1c54d069b5 Fix misleading or interchanged localized resources.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7005648d55)
\
N -- N -- N refs/heads/geoapi-4.0 (1c54d069b5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/org/apache/sis/metadata/internal/Resources.java | 2 +-
.../org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(sis) 01/01: Fix misleading or interchanged localized resources.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1c54d069b5ab9b2112103dc51a9b38d7f97337c3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Nov 15 12:16:54 2023 +0100
Fix misleading or interchanged localized resources.
---
.../main/org/apache/sis/metadata/internal/Resources.java | 2 +-
.../main/org/apache/sis/metadata/internal/Resources.properties | 2 +-
.../main/org/apache/sis/metadata/internal/Resources_fr.properties | 2 +-
.../org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java | 2 +-
.../main/org/apache/sis/util/resources/Errors.properties | 2 +-
.../main/org/apache/sis/util/resources/Errors_fr.properties | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
index 24c8c1649d..dba3fb97d4 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.java
@@ -79,7 +79,7 @@ public class Resources extends IndexedResourceBundle {
public static final short ExpectedInterface_2 = 5;
/**
- * Enregistrement multilignes
+ * Multiline record
*/
public static final short MultilineRecord = 9;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
index 69753a74e0..7dcbf33cf8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources.properties
@@ -24,7 +24,7 @@ ConnectionAlreadyInitialized_1 = Connection to \u201c{0}\u201d database is al
ElementAlreadyInitialized_1 = This metadata element is already initialized with value \u201c{0}\u201d.
ElementsOmitted_1 = \u2026 {0} elements omitted \u2026
ExpectedInterface_2 = Illegal class `{1}`. Specify the `{0}` interface instead.
-MultilineRecord = Enregistrement multilignes
+MultilineRecord = Multiline record
SingleNumber = Single number
SingleText = Single text
UnmodifiableMetadata = This metadata is not modifiable.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
index 6219bd6ce9..da3f33b5e1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Resources_fr.properties
@@ -29,7 +29,7 @@ ConnectionAlreadyInitialized_1 = La connexion \u00e0 la base de donn\u00e9es
ElementAlreadyInitialized_1 = Cet \u00e9l\u00e9ment de m\u00e9ta-donn\u00e9e est d\u00e9j\u00e0 initialis\u00e9 avec la valeur \u00ab\u202f{0}\u202f\u00bb.
ElementsOmitted_1 = \u2026 {0} \u00e9l\u00e9ments omis \u2026
ExpectedInterface_2 = La classe `{1}` est ill\u00e9gale. Sp\u00e9cifiez l\u2019interface `{0}` \u00e0 la place.
-MultilineRecord = Multiline record
+MultilineRecord = Enregistrement multilignes
SingleNumber = Nombre seul
SingleText = Texte seul
UnmodifiableMetadata = Cette m\u00e9ta-donn\u00e9e n\u2019est pas modifiable.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
index a13243d6d1..d16fde9d42 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.java
@@ -1063,7 +1063,7 @@ public class Errors extends IndexedResourceBundle {
public static final short UnsupportedType_1 = 163;
/**
- * XPath “{0}” is not supported.
+ * XPath “{0}” is not recognized. The current implementation supports only simple paths.
*/
public static final short UnsupportedXPath_1 = 195;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
index c595f1edd4..ee3182a5bc 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties
@@ -224,7 +224,7 @@ UnsupportedAxisDirection_1 = Axes with \u201c{0}\u201d direction are not
UnsupportedCoordinateSystem_1 = The \u201c{0}\u201d coordinate system is not supported by this operation.
UnsupportedDatum_1 = The \u201c{0}\u201d datum is not supported by this operation.
UnsupportedType_1 = The \u2018{0}\u2019 type is not supported in this context.
-UnsupportedXPath_1 = XPath \u201c{0}\u201d is not supported.
+UnsupportedXPath_1 = XPath \u201c{0}\u201d is not recognized. The current implementation supports only simple paths.
ValueAlreadyDefined_1 = A value is already defined for \u201c{0}\u201d.
ValueNotGreaterThanZero_2 = Value \u2018{0}\u2019 = {1,number} is invalid. Expected a number greater than 0.
ValueOutOfRange_4 = Value \u2018{0}\u2019 = {3} is invalid. Expected a value in the [{1} \u2026 {2}] range.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
index 16c030cad5..d22d6076bd 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors_fr.properties
@@ -220,7 +220,7 @@ UnsupportedAxisDirection_1 = Les axes de direction \u00ab\u202f{0}\u202f\
UnsupportedCoordinateSystem_1 = Le syst\u00e8me de coordonn\u00e9es \u00ab\u202f{0}\u202f\u00bb n\u2019est pas support\u00e9 par cette op\u00e9ration.
UnsupportedDatum_1 = Le r\u00e9f\u00e9rentiel \u00ab\u202f{0}\u202f\u00bb n\u2019est pas support\u00e9 par cette op\u00e9ration.
UnsupportedType_1 = Le type \u2018{0}\u2019 n\u2019est pas support\u00e9 dans ce contexte.
-UnsupportedXPath_1 = Le chemin x-path \u00ab\u202f{0}\u202f\u00bb n\u2019est pas support\u00e9.
+UnsupportedXPath_1 = Le chemin x-path \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnu. L\u2019impl\u00e9mentation actuelle ne supporte que des chemins simples.
ValueAlreadyDefined_1 = Une valeur est d\u00e9j\u00e0 d\u00e9finie pour \u00ab\u202f{0}\u202f\u00bb.
ValueNotGreaterThanZero_2 = La valeur \u2018{0}\u2019 = {1,number} n\u2019est pas valide. On attendait un nombre positif non-nul.
ValueOutOfRange_4 = La valeur \u2018{0}\u2019 = {3} est invalide. Une valeur dans la plage [{1} \u2026 {2}] \u00e9tait attendue.