Author: knoaman
Date: Wed Feb 1 10:01:59 2006
New Revision: 374127
URL: http://svn.apache.org/viewcvs?rev=374127&view=rev
Log:
Error messages have broken substitution tokens.
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml?rev=374127&r1=374126&r2=374127&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
(original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml Wed
Feb 1 10:01:59 2006
@@ -120,8 +120,8 @@
<Message Id="ForbiddenDerivation" Text="Derivation by extension or
restriction is forbidden by either the base type '{0}' or the schema"/>
<Message Id="AtomicItemType" Text="The {item type definition} must
have {variety} of atomic or union (where all member types must be atomic)"/>
<Message Id="MemberTypeNoUnion" Text="The {member type
definitions} must all have {variety} of atomic or list"/>
- <Message Id="GroupContentError" Text="The group:'0' must contain
(all | choice | sequence)"/>
- <Message Id="AttGroupContentError" Text="The attributeGroup:'0'
must match (annotation?. ((attribute | attributeGroup)*, anyAttribute?))"/>
+ <Message Id="GroupContentError" Text="The group:'{0}' must contain
(all | choice | sequence)"/>
+ <Message Id="AttGroupContentError" Text="The attributeGroup:'{0}'
must match (annotation?. ((attribute | attributeGroup)*, anyAttribute?))"/>
<Message Id="MinMaxOnGroupChild" Text="The child of a model group
definition must not specify either the minOccurs or maxOccurs attribute."/>
<Message Id="DeclarationNotFound" Text="The {0} -'{1}:{2}'- not
found in the schema"/>
<Message Id="AllContentLimited" Text="A group whose content is
'all' must only appear as the content type of a complex type definition."/>
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt?rev=374127&r1=374126&r2=374127&view=diff
==============================================================================
---
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
(original)
+++
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Wed Feb 1 10:01:59 2006
@@ -115,8 +115,8 @@
"Derivation by extension or restriction is forbidden by either
the base type '{0}' or the schema " ,
"The {item type definition} must have {variety} of atomic or
union (where all member types must be atomic) " ,
"The {member type definitions} must all have {variety} of
atomic or list " ,
- "The group:'0' must contain (all | choice | sequence) " ,
- "The attributeGroup:'0' must match (annotation?. ((attribute |
attributeGroup)*, anyAttribute?)) " ,
+ "The group:'{0}' must contain (all | choice | sequence) " ,
+ "The attributeGroup:'{0}' must match (annotation?. ((attribute
| attributeGroup)*, anyAttribute?)) " ,
"The child of a model group definition must not specify either
the minOccurs or maxOccurs attribute. " ,
"The {0} -'{1}:{2}'- not found in the schema " ,
"A group whose content is 'all' must only appear as the content
type of a complex type definition. " ,
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp?rev=374127&r1=374126&r2=374127&view=diff
==============================================================================
---
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
(original)
+++
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Wed Feb 1 10:01:59 2006
@@ -281,11 +281,11 @@
, {
0x0054,0x0068,0x0065,0x0020,0x007B,0x006D,0x0065,0x006D,0x0062,0x0065,0x0072,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0064,0x0065,0x0066,0x0069,0x006E,0x0069,0x0074,0x0069,0x006F,0x006E,0x0073,0x007D,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,
0x0061,0x006C,0x006C,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x007B,0x0076,0x0061,0x0072,0x0069,0x0065,0x0074,0x0079,0x007D,0x0020,0x006F,0x0066,0x0020,0x0061,0x0074,0x006F,0x006D,0x0069,0x0063,0x0020,0x006F,0x0072,0x0020,0x006C,0x0069,0x0073,
0x0074,0x00 }
- , {
0x0054,0x0068,0x0065,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x003A,0x0027,0x0030,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0063,0x006F,0x006E,0x0074,0x0061,0x0069,0x006E,0x0020,0x0028,0x0061,0x006C,0x006C,0x0020,0x007C,0x0020,0x0063,
-
0x0068,0x006F,0x0069,0x0063,0x0065,0x0020,0x007C,0x0020,0x0073,0x0065,0x0071,0x0075,0x0065,0x006E,0x0063,0x0065,0x0029,0x00
}
- , {
0x0054,0x0068,0x0065,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0047,0x0072,0x006F,0x0075,0x0070,0x003A,0x0027,0x0030,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x006D,0x0061,0x0074,0x0063,0x0068,0x0020,0x0028,
-
0x0061,0x006E,0x006E,0x006F,0x0074,0x0061,0x0074,0x0069,0x006F,0x006E,0x003F,0x002E,0x0020,0x0028,0x0028,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x007C,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,
-
0x0065,0x0047,0x0072,0x006F,0x0075,0x0070,0x0029,0x002A,0x002C,0x0020,0x0061,0x006E,0x0079,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003F,0x0029,0x0029,0x00
}
+ , {
0x0054,0x0068,0x0065,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x003A,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0063,0x006F,0x006E,0x0074,0x0061,0x0069,0x006E,0x0020,0x0028,0x0061,0x006C,0x006C,0x0020,0x007C,
+
0x0020,0x0063,0x0068,0x006F,0x0069,0x0063,0x0065,0x0020,0x007C,0x0020,0x0073,0x0065,0x0071,0x0075,0x0065,0x006E,0x0063,0x0065,0x0029,0x00
}
+ , {
0x0054,0x0068,0x0065,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0047,0x0072,0x006F,0x0075,0x0070,0x003A,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x006D,0x0061,0x0074,0x0063,0x0068,
+
0x0020,0x0028,0x0061,0x006E,0x006E,0x006F,0x0074,0x0061,0x0074,0x0069,0x006F,0x006E,0x003F,0x002E,0x0020,0x0028,0x0028,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x007C,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,
+
0x0075,0x0074,0x0065,0x0047,0x0072,0x006F,0x0075,0x0070,0x0029,0x002A,0x002C,0x0020,0x0061,0x006E,0x0079,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003F,0x0029,0x0029,0x00
}
, {
0x0054,0x0068,0x0065,0x0020,0x0063,0x0068,0x0069,0x006C,0x0064,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x0020,0x0064,0x0065,0x0066,0x0069,0x006E,0x0069,0x0074,0x0069,
0x006F,0x006E,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0079,0x0020,0x0065,0x0069,0x0074,0x0068,0x0065,0x0072,0x0020,0x0074,0x0068,0x0065,0x0020,0x006D,0x0069,0x006E,0x004F,
0x0063,0x0063,0x0075,0x0072,0x0073,0x0020,0x006F,0x0072,0x0020,0x006D,0x0061,0x0078,0x004F,0x0063,0x0063,0x0075,0x0072,0x0073,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x002E,0x00
}
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg?rev=374127&r1=374126&r2=374127&view=diff
==============================================================================
---
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
(original)
+++
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Wed Feb 1 10:01:59 2006
@@ -110,8 +110,8 @@
111 Derivation by extension or restriction is forbidden by either the base
type '{0}' or the schema
112 The {item type definition} must have {variety} of atomic or union (where
all member types must be atomic)
113 The {member type definitions} must all have {variety} of atomic or list
-114 The group:'0' must contain (all | choice | sequence)
-115 The attributeGroup:'0' must match (annotation?. ((attribute |
attributeGroup)*, anyAttribute?))
+114 The group:'{0}' must contain (all | choice | sequence)
+115 The attributeGroup:'{0}' must match (annotation?. ((attribute |
attributeGroup)*, anyAttribute?))
116 The child of a model group definition must not specify either the
minOccurs or maxOccurs attribute.
117 The {0} -'{1}:{2}'- not found in the schema
118 A group whose content is 'all' must only appear as the content type of a
complex type definition.
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc?rev=374127&r1=374126&r2=374127&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc
(original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Version.rc
Wed Feb 1 10:01:59 2006
@@ -212,8 +212,8 @@
111
L"\x0044\x0065\x0072\x0069\x0076\x0061\x0074\x0069\x006F\x006E\x0020\x0062\x0079\x0020\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0020\x006F\x0072\x0020\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x0020\x0069\x0073\x0020\x0066\x006F\x0072\x0062\x0069\x0064\x0064\x0065\x006E\x0020\x0062\x0079\x0020\x0065\x0069\x0074\x0068\x0065\x0072\x0020\x0074\x0068\x0065\x0020\x0062\x0061\x0073\x0065\x0020\x0074\x0079\x0070\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006F\x0072\x0020\x0074\x0068\x0065\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x00"
112
L"\x0054\x0068\x0065\x0020\x007B\x0069\x0074\x0065\x006D\x0020\x0074\x0079\x0070\x0065\x0020\x0064\x0065\x0066\x0069\x006E\x0069\x0074\x0069\x006F\x006E\x007D\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x007B\x0076\x0061\x0072\x0069\x0065\x0074\x0079\x007D\x0020\x006F\x0066\x0020\x0061\x0074\x006F\x006D\x0069\x0063\x0020\x006F\x0072\x0020\x0075\x006E\x0069\x006F\x006E\x0020\x0028\x0077\x0068\x0065\x0072\x0065\x0020\x0061\x006C\x006C\x0020\x006D\x0065\x006D\x0062\x0065\x0072\x0020\x0074\x0079\x0070\x0065\x0073\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0061\x0074\x006F\x006D\x0069\x0063\x0029\x00"
113
L"\x0054\x0068\x0065\x0020\x007B\x006D\x0065\x006D\x0062\x0065\x0072\x0020\x0074\x0079\x0070\x0065\x0020\x0064\x0065\x0066\x0069\x006E\x0069\x0074\x0069\x006F\x006E\x0073\x007D\x0020\x006D\x0075\x0073\x0074\x0020\x0061\x006C\x006C\x0020\x0068\x0061\x0076\x0065\x0020\x007B\x0076\x0061\x0072\x0069\x0065\x0074\x0079\x007D\x0020\x006F\x0066\x0020\x0061\x0074\x006F\x006D\x0069\x0063\x0020\x006F\x0072\x0020\x006C\x0069\x0073\x0074\x00"
- 114
L"\x0054\x0068\x0065\x0020\x0067\x0072\x006F\x0075\x0070\x003A\x0027\x0030\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0063\x006F\x006E\x0074\x0061\x0069\x006E\x0020\x0028\x0061\x006C\x006C\x0020\x007C\x0020\x0063\x0068\x006F\x0069\x0063\x0065\x0020\x007C\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0029\x00"
- 115
L"\x0054\x0068\x0065\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0047\x0072\x006F\x0075\x0070\x003A\x0027\x0030\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x006D\x0061\x0074\x0063\x0068\x0020\x0028\x0061\x006E\x006E\x006F\x0074\x0061\x0074\x0069\x006F\x006E\x003F\x002E\x0020\x0028\x0028\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x007C\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0047\x0072\x006F\x0075\x0070\x0029\x002A\x002C\x0020\x0061\x006E\x0079\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003F\x0029\x0029\x00"
+ 114
L"\x0054\x0068\x0065\x0020\x0067\x0072\x006F\x0075\x0070\x003A\x0027\x007B\x0030\x007D\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0063\x006F\x006E\x0074\x0061\x0069\x006E\x0020\x0028\x0061\x006C\x006C\x0020\x007C\x0020\x0063\x0068\x006F\x0069\x0063\x0065\x0020\x007C\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0029\x00"
+ 115
L"\x0054\x0068\x0065\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0047\x0072\x006F\x0075\x0070\x003A\x0027\x007B\x0030\x007D\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x006D\x0061\x0074\x0063\x0068\x0020\x0028\x0061\x006E\x006E\x006F\x0074\x0061\x0074\x0069\x006F\x006E\x003F\x002E\x0020\x0028\x0028\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x007C\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0047\x0072\x006F\x0075\x0070\x0029\x002A\x002C\x0020\x0061\x006E\x0079\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003F\x0029\x0029\x00"
116
L"\x0054\x0068\x0065\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x006F\x0066\x0020\x0061\x0020\x006D\x006F\x0064\x0065\x006C\x0020\x0067\x0072\x006F\x0075\x0070\x0020\x0064\x0065\x0066\x0069\x006E\x0069\x0074\x0069\x006F\x006E\x0020\x006D\x0075\x0073\x0074\x0020\x006E\x006F\x0074\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0079\x0020\x0065\x0069\x0074\x0068\x0065\x0072\x0020\x0074\x0068\x0065\x0020\x006D\x0069\x006E\x004F\x0063\x0063\x0075\x0072\x0073\x0020\x006F\x0072\x0020\x006D\x0061\x0078\x004F\x0063\x0063\x0075\x0072\x0073\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x002E\x00"
117
L"\x0054\x0068\x0065\x0020\x007B\x0030\x007D\x0020\x002D\x0027\x007B\x0031\x007D\x003A\x007B\x0032\x007D\x0027\x002D\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x0075\x006E\x0064\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x00"
118
L"\x0041\x0020\x0067\x0072\x006F\x0075\x0070\x0020\x0077\x0068\x006F\x0073\x0065\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0069\x0073\x0020\x0027\x0061\x006C\x006C\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x006F\x006E\x006C\x0079\x0020\x0061\x0070\x0070\x0065\x0061\x0072\x0020\x0061\x0073\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0074\x0079\x0070\x0065\x0020\x006F\x0066\x0020\x0061\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0020\x0074\x0079\x0070\x0065\x0020\x0064\x0065\x0066\x0069\x006E\x0069\x0074\x0069\x006F\x006E\x002E\x00"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
