Author: dwoods
Date: Fri Feb 26 17:04:35 2010
New Revision: 916759
URL: http://svn.apache.org/viewvc?rev=916759&view=rev
Log:
OPENJPA-1538 Minor grammar fixes in messages. Patch contributed by Cathy
Nordstrom.
Modified:
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
Modified:
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties?rev=916759&r1=916758&r2=916759&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
Fri Feb 26 17:04:35 2010
@@ -70,7 +70,7 @@
bad-fg-field: Fetch group "{0}" in type "{1}" includes field "{2}", but \
this field is not declared in "{1}", or is not persistent. Currently, \
OpenJPA only supports declared fields in fetch groups.
-missing-included-fg:"{0}" declares a fetch group "{1}" includes "{2}". But \
+missing-included-fg: "{0}" declares a fetch group "{1}" which includes "{2}",
but \
the included fetch group "{2}" can not be found in "{0}". Currently,
all \
included fetch groups must be declared within the same entity scope.
not-update-delete-query: Cannot perform an update or delete operation \
Modified:
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties?rev=916759&r1=916758&r2=916759&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
Fri Feb 26 17:04:35 2010
@@ -27,7 +27,7 @@
field-missing: "{0}" is not a managed field in "{1}". Available fields are {2}.
field-not-decl: "{0}" is not declared in "{1}" itself but one of its \
persistent super class "{2}"
-field-type-mismatch: Actual type of field "{0}" "{1}" does not match with the \
+field-type-mismatch: Actual type "{1}" of field "{0}" does not match with the \
expected type "{2}"
field-element-type-mismatch: Actual element type of field "{0}" "{1}" does not
\
match with the expected element type "{2}"
@@ -52,8 +52,8 @@
meta-class-no-anno: Meta class "{0}" registered for "{1}" is not annotated \
with "{2}" annotation.
-meta-field-mismatch: The field "{0}" in meta class "{1}" is of type "{2}" does
\
- not match with the persistent property type "{3}".
+meta-field-mismatch: The field "{0}" in meta class "{1}" is of type "{2}" \
+ which does not match the persistent property type "{3}".
type-wrong-category:"{0}" categorized as "{1}" should be a "{2}"
mmg-asl-header: Licensed to the Apache Software Foundation (ASF) under one \
or more contributor license agreements. See the NOTICE file
distributed \
@@ -81,4 +81,4 @@
decl-version-not-found: Declared version attribute of {1} type not found in
{2}
version-not-found: Version attribute of {1} type not found in {2}
generic-type-param: Can not determine generic type parameter for field {0} of
type {1} in {2}. \
- Using java.lang.Object.
\ No newline at end of file
+ Using java.lang.Object.
