Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc?rev=645555&r1=645554&r2=645555&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc Mon Apr  7 
08:10:07 2008
@@ -183,208 +183,210 @@
     81                L"Included schema '{0}' has a different targetNameSpace 
'{1}'\x00"
     82                L"At most one <annotation> element is expected in the 
content.\x00"
     83                L"The content must be (annotation?, simpleType?) for 
attribute '{0}={1}'\x00"
-    84                L"Attribute '{0}' must appear in '{1}' '{2}' 
declarations\x00"
-    85                L"Attribute '{0}' cannot appear in '{1}' '{2}' 
declarations\x00"
-    86                L"Value of minOccurs '{0}' must not be greater than 
value of maxOccurs '{1}'\x00"
-    87                L"'anyAttribute' elements can contain at most one 
'annotation' element in their children\x00"
-    88                L"Global <{0}> must have a name\x00"
-    89                L"No circular definitions are allowed: '{0}'\x00"
-    90                L"Global '{0}:{1}' declared more than once or also 
declared as '{2}'\x00"
-    91                L"Global '{0}:{1}' declared more than once\x00"
-    92                L"Invalid value '{0}' for facet 'whiteSpace'. Value 
should be 'collapse'.\x00"
-    93                L"The namespace of an <import> element must be different 
from the targetNamespace of the <import>ing schema\x00"
-    94                L"If the namespace on an <import> element is not 
present, the <import>ing schema must have a targetNamespace\x00"
-    95                L"Element '{0}' must not have a value constraint:'{1}' 
as its type is derived from ID\x00"
-    96                L"It is an error for NOTATION to be used directly in a 
schema in element/attribute '{0}'\x00"
-    97                L"For element '{0}', the {content type} is mixed, then 
the {content type}'s particle must be emptiable\x00"
-    98                L"The content of complexType is EMPTY, but base is not 
empty or does not have emptiable particle.\x00"
-    99                L"The content type of the base type:'{0}' and derived 
type:'{1}' must both be mixed or element-only.\x00"
-    100               L"The content type is not a valid restriction of the 
content type of the base.\x00"
-    101               L"Derivation by extension or restriction is forbidden by 
either the base type '{0}' or the schema\x00"
-    102               L"The {item type definition} must have {variety} of 
atomic or union (where all member types must be atomic)\x00"
-    103               L"The group:'{0}' must contain (all | choice | 
sequence)\x00"
-    104               L"The attributeGroup:'{0}' must match (annotation?. 
((attribute | attributeGroup)*, anyAttribute?))\x00"
-    105               L"The child of a model group definition must not specify 
either the minOccurs or maxOccurs attribute.\x00"
-    106               L"The {0} '{1}:{2}' not found in the schema\x00"
-    107               L"A group whose content is 'all' must only appear as the 
content type of a complex type definition.\x00"
-    108               L"When a model group has {compositor} 'all' which 
constitutes the {content type} of a complex type, minOccurs=maxOccurs=1\x00"
-    109               L"In an 'all' schema component, the value of 
minOccurs/maxOccurs of an element must be '0' or '1'.\x00"
-    110               L"Attribute '{0}' already defined in base and should not 
appear in derivation by extension.\x00"
-    111               L"The intensional intersection of {attributes wildcard}s 
must be expressible\x00"
-    112               L"Base type definition does not have any attributes\x00"
-    113               L"Attribute '{0}' has an inconsistent REQUIRED setting 
with that of the base\x00"
-    114               L"Type of attribute '{0}' must be validly derived from 
type of attribute in base\x00"
-    115               L"Attribute '{0}' is either not fixed, or has a 
different value from that of the base\x00"
-    116               L"Attribute '{0}' has invalid target namespace with 
respect to a base wildcard constraint or, base has no wildcard\x00"
-    117               L"An attribute wildcard is present in the derived type, 
but not in the base\x00"
-    118               L"The attribute wildcard in the derived type is not a 
valid subset of that in the base\x00"
-    119               L"Attribute '{0}' cannot modify the 'use' attribute in a 
derived type, if base attribute use is prohibited\x00"
-    120               L"The wildcard attribute in the derived type must be 
identical to or stronger than the one in the base.\x00"
-    121               L"Content of <all> is restricted to elements only. '{0}' 
encountered and ignored.\x00"
-    122               L"Redefined schema '{0}' has a different targetNameSpace 
'{1}'.\x00"
-    123               L"A simpleType child of a <redefine> must have a 
restriction element as a child\x00"
-    124               L"The base attribute of the restriction child of a 
simpleType, must be the same as the redefine simpleType's name attribute\x00"
-    125               L"A complexType child of a <redefine> must have a 
restriction or extension element as a grandchild\x00"
-    126               L"The base attribute of a restriction/extension must be 
the same as the complexType's name attribute in <redefine>\x00"
-    127               L"The group '{0}' which contains a reference to a group 
being redefined must have minOccurs = maxOccurs = 1\x00"
-    128               L"Could not find a declaration in the schema to be 
redefined corresponding to '{0}'\x00"
-    129               L"If a group child of a <redefine> element contains a 
group ref'ing itself, it must have exactly 1 reference.\x00"
-    130               L"If an attributeGroup of a <redefine> element contains 
a reference to itself, such reference must be exactly 1\x00"
-    131               L"A <redefine> element cannot contain a child of type 
'{0}'\x00"
-    132               L"The notation declaration '{0}:{1}' is not found\x00"
-    133               L"More than one identity constraint named '{0}'.\x00"
-    134               L"The content of an identity constraint must match 
(annotation?, selector, field+)\x00"
-    135               L"Key reference declaration '{0}' refers to unknown key 
with name '{1}'.\x00"
-    136               L"Cardinality of fields for keyref '{0}' and key '{1}' 
must match.\x00"
-    137               L"Xpath expression is either missing or empty\x00"
-    138               L"The {value constraint} of an attribute ref is not 
fixed or different from the fixed {value constraint} of '{0}'\x00"
-    139               L"The {type definition} for attribute '{0}={1}' is or is 
derived from ID, and must not have {value constraint}\x00"
-    140               L"More than one attribute derived from type ID cannot 
appear in the same complex type - '{0}' ignored\x00"
-    141               L"More than one attribute derived from type ID cannot 
appear in the same attribute group - '{0}' ignored\x00"
-    142               L"'' is not a legal value for the targetNamespace 
attribute; the attribute must be absent or contain a nonempty value\x00"
-    143               L"{0}\x00"
-    144               L"Invalid Redefine: '{0}' has already been included or 
redefined\x00"
-    145               L"Schema Representation Constraint: Namespace '{0}' is 
referenced without <import> declaration\x00"
-    146               L"An 'all' model group that's part of a complex type 
definition must constitute the entire content type of the definition\x00"
-    147               L"An <annotation> can only contain <appinfo> and 
<documentation> elements\x00"
-    148               L"Invalid facet name: '{0}'\x00"
-    149               L"The root element name of an XML Schema should be 
'schema'.\x00"
-    150               L"Circular substitution groups are disallowed for 
element '{0}'.\x00"
-    151               L"The namespace of element '{0}' must be from the schema 
namespace.\x00"
-    152               L"The {target namespace} of '{0}' must not match 
'http://www.w3.org/2001/XMLSchema-instance'.\x00"
-    153               L"The namespace declaration is invalid.\x00"
-    154               L"Namespace fixup cannot be performed on a DOM Level 1 
Node.\x00"
-    157               L"The parser has encountered more than '{0}' entity 
expansions in this document; this is the limit imposed by the application.\x00"
-    158               L"Expected comment or CDATA\x00"
-    159               L"Expected an attribute name\x00"
-    160               L"Expected a notation name\x00"
-    161               L"Repetition of individual elements is not legal for 
mixed content models\x00"
-    162               L"Expected default attribute declaration, assuming 
#IMPLIED\x00"
-    163               L"Expected equal sign\x00"
-    164               L"Expected an element name\x00"
-    165               L"Comments must start with <!--\x00"
-    166               L"Invalid document structure\x00"
-    167               L"Expected a 'version=', 'encoding=', or 
'standalone='\x00"
-    168               L"Invalid XML version string\x00"
-    169               L"Unsupported XML version, '{0}'\x00"
-    170               L"Unterminated XML decl\x00"
-    171               L"Invalid XML encoding declaration, '{0}'\x00"
-    172               L"Invalid standalone declaration\x00"
-    173               L"Unterminated comment\x00"
-    174               L"Processing instruction name expected\x00"
-    175               L"Unterminated processing instruction\x00"
-    176               L"Invalid character (Unicode: 0x{0})\x00"
-    177               L"Unterminated start tag, '{0}'\x00"
-    178               L"Expected an attribute value\x00"
-    179               L"Unterminated end tag, '{0}'\x00"
-    180               L"Expected type (CDATA, ID, NMTOKEN, etc.), for 
attribute '{0}' of element '{1}'\x00"
-    181               L"Expected end of tag '{0}'\x00"
-    182               L"Expected tag name, comment, PI, or other markup\x00"
-    183               L"Not valid after content\x00"
-    184               L"Expected comment\x00"
-    185               L"Expected comment or processing instruction\x00"
-    186               L"Expected whitespace\x00"
-    187               L"No root element in DOCTYPE\x00"
-    188               L"Expected quoted string\x00"
-    189               L"Expected public id\x00"
-    190               L"Invalid character in public id (Unicode: 0x{0})\x00"
-    191               L"Unterminated DOCTYPE declaration\x00"
-    192               L"Invalid character in internal subset (Unicode: 
0x{0})\x00"
-    193               L"Unexpected whitespace\x00"
-    194               L"Invalid character in attribute value {0} (Unicode: 
0x{1})\x00"
-    195               L"Expected a markup declaration\x00"
-    196               L"Text declaration not legal at this point\x00"
-    197               L"Conditional section in internal subset\x00"
-    198               L"Expected parameter entity name\x00"
-    199               L"Unterminated entity declaration, '{0}'\x00"
-    200               L"Invalid character reference\x00"
-    201               L"Unterminated character reference\x00"
-    202               L"Expected entity name for reference\x00"
-    203               L"Entity '{0}' was not found\x00"
-    204               L"Unparsed entity references, '{0}', not valid at this 
point\x00"
-    205               L"Unterminated entity reference, '{0}'\x00"
-    206               L"Recursive entity expansion, '{0}'\x00"
-    207               L"Partial markup in entity value\x00"
-    208               L"Unterminated element declaration, '{0}'\x00"
-    209               L"Expected content specification expression for element 
'{0}'\x00"
-    210               L"Expected asterisk\x00"
-    211               L"'{0}' is a mixed content model that is not terminated 
properly.\x00"
-    212               L"Expected system or public id\x00"
-    213               L"Unterminated notation declaration\x00"
-    214               L"Expected ',', '|', or ')' characters\x00"
-    215               L"Expected '|' or ')' characters\x00"
-    216               L"Expected ',' or ')' characters or close parenthesis in 
content model of element '{0}'\x00"
-    217               L"Expected enumeration value for attribute '{0}'\x00"
-    218               L"Expected | enumeration separator, or closing paren\x00"
-    219               L"Unterminated entity literal\x00"
-    220               L"There are more end tags than start tags\x00"
-    221               L"Expected an open parenthesis\x00"
-    222               L"The attribute '{0}' is already used in element 
'{1}'\x00"
-    223               L"A '<' character cannot be used in attribute '{0}', 
except through &lt;\x00"
-    224               L"A leading surrogate character was not followed by a 
legal second character\x00"
-    225               L"Expected ']]>' to end a conditional section\x00"
-    226               L"Expected INCLUDE or IGNORE at this point\x00"
-    227               L"Expected [ to follow INCLUDE or IGNORE\x00"
-    228               L"Unexpected end of entity {0}\x00"
-    229               L"A PE propagated out of the int/ext subset, discarding 
extra text\x00"
-    230               L"An extra ] character was found\x00"
-    231               L"PE refs are not allowed inside markup in the internal 
subset\x00"
-    232               L"An entity propagated out of the content section into 
Miscellaneous\x00"
-    233               L"Expected &# to be followed by a numeric character 
value\x00"
-    234               L"Expected an open bracket ('[')\x00"
-    235               L"The sequence ']]>' is not allowed in character 
data\x00"
-    236               L"Illegal sequence '--' in comment\x00"
-    237               L"Unterminated CDATA section\x00"
-    238               L"Expected NDATA\x00"
-    239               L"NDATA is not legal for parameter entities\x00"
-    240               L"Hex radix character refs must use 'x', not 'X'\x00"
-    241               L"'{0}' has already been set\x00"
-    242               L"The XMLDecl strings must be in the order: version, 
encoding, standalone\x00"
-    243               L"External entities cannot be referred to from attribute 
values\x00"
-    244               L"The XML or Text decl must start with '<?xml ', not 
'<?XML '\x00"
-    245               L"Expected a literal entity value or PUBLIC/SYSTEM 
id\x00"
-    246               L"'{0}' is not a valid digit for the indicated radix\x00"
-    247               L"The input ended before all started tags were ended. 
Last tag started was '{0}'\x00"
-    248               L"Nested CDATA sections are not allowed\x00"
-    249               L"The prefix '{0}' has not been mapped to any URI\x00"
-    250               L"The start and the end tag were in the different 
entities\x00"
-    251               L"The main XML document cannot be empty\x00"
-    252               L"CDATA is not allowed outside the root element\x00"
-    253               L"Got an unexpected trailing surrogate character\x00"
-    254               L"No processing instruction starts with 'xml'\x00"
-    255               L"The XML or Text declaration must start at line/column 
1/1\x00"
-    256               L"The 'version=' string is required in an XMLDecl\x00"
-    257               L"The 'standalone=' string is only allowed in the main 
XML entity\x00"
-    258               L"The 'encoding=' string is required in an Text Decl\x00"
-    259               L"Colons are not allowed in this name when namespaces 
are enabled\x00"
-    260               L"{0}\x00"
-    261               L"The schemaLocation attribute does not contain pairs of 
values.\x00"
-    262               L"Fatal error encountered during schema scan\x00"
-    263               L"Reference to external entity declaration '{0}' is not 
allowed in a standalone document.\x00"
-    264               L"Partial markup in parameter entity replacement text in 
a complete declaration.\x00"
-    265               L"The value of the attribute '{0}' is invalid. Prefixed 
namespace bindings may not be empty.\x00"
-    266               L"The prefix 'xmlns' cannot be bound to any namespace 
explicitly.\x00"
-    267               L"The namespace for 'xmlns' cannot be bound to any 
prefix explicitly.\x00"
-    268               L"The prefix 'xml' cannot be bound to any namespace 
other than its usual namespace.\x00"
-    269               L"The namespace for 'xml' cannot be bound to any prefix 
other than 'xml'.\x00"
-    270               L"Element '{0}' cannot have 'xmlns' as its prefix.\x00"
-    271               L"Complex Type Definition Representation OK - 2.2: 
<restriction> must have a <simpleType> child.\x00"
-    272               L"DOCTYPE root element qname beginning with '{0}' 
invalid\x00"
-    273               L"Element qname beginning with '{0}' invalid\x00"
-    274               L"Attribute qname beginning with '{0}' invalid\x00"
-    275               L"Entity qname for reference beginning '{0}' invalid\x00"
-    276               L"Already seen doctype\x00"
-    277               L"Found a fallback element not a direct child of include 
element\x00"
-    278               L"include element found without href attribute\x00"
-    279               L"Found an include element with xpointer specification. 
XPointer not yet supported\x00"
-    280               L"Invalid parse attribute value '{0}' found on include 
element - only text or xml is valid\x00"
-    281               L"Multiple fallback elements found in include element in 
document '{0}'\x00"
-    282               L"Include failed, no fallback found in document 
'{0}'\x00"
-    283               L"Circular inclusion document '{0}' includes previously 
included document\x00"
-    284               L"Circular inclusion document '{0}' includes itself\x00"
-    285               L"Element '{0}' is not allowed as a child of an 
xi:include element\x00"
-    286               L"Included notation '{0}' conflicts with a notation 
already defined\x00"
-    287               L"Included entity '{0}' conflicts with an entity already 
defined\x00"
+    84                L"Attribute '{0}' must appear in global <{1}> 
declarations\x00"
+    85                L"Attribute '{0}' must appear in local <{1}> 
declarations\x00"
+    86                L"Attribute '{0}' cannot appear in global <{1}> 
declarations\x00"
+    87                L"Attribute '{0}' cannot appear in local <{1}> 
declarations\x00"
+    88                L"Value of minOccurs '{0}' must not be greater than 
value of maxOccurs '{1}'\x00"
+    89                L"'anyAttribute' elements can contain at most one 
'annotation' element in their children\x00"
+    90                L"Global <{0}> must have a name\x00"
+    91                L"No circular definitions are allowed: '{0}'\x00"
+    92                L"Global '{0}:{1}' declared more than once or also 
declared as '{2}'\x00"
+    93                L"Global '{0}:{1}' declared more than once\x00"
+    94                L"Invalid value '{0}' for facet 'whiteSpace'. Value 
should be 'collapse'.\x00"
+    95                L"The namespace of an <import> element must be different 
from the targetNamespace of the <import>ing schema\x00"
+    96                L"If the namespace on an <import> element is not 
present, the <import>ing schema must have a targetNamespace\x00"
+    97                L"Element '{0}' must not have a value constraint:'{1}' 
as its type is derived from ID\x00"
+    98                L"It is an error for NOTATION to be used directly in a 
schema in element/attribute '{0}'\x00"
+    99                L"For element '{0}', the {content type} is mixed, then 
the {content type}'s particle must be emptiable\x00"
+    100               L"The content of complexType is EMPTY, but base is not 
empty or does not have emptiable particle.\x00"
+    101               L"The content type of the base type:'{0}' and derived 
type:'{1}' must both be mixed or element-only.\x00"
+    102               L"The content type is not a valid restriction of the 
content type of the base.\x00"
+    103               L"Derivation by extension or restriction is forbidden by 
either the base type '{0}' or the schema\x00"
+    104               L"The {item type definition} must have {variety} of 
atomic or union (where all member types must be atomic)\x00"
+    105               L"The group:'{0}' must contain (all | choice | 
sequence)\x00"
+    106               L"The attributeGroup:'{0}' must match (annotation?. 
((attribute | attributeGroup)*, anyAttribute?))\x00"
+    107               L"The child of a model group definition must not specify 
either the minOccurs or maxOccurs attribute.\x00"
+    108               L"The {0} '{1}:{2}' not found in the schema\x00"
+    109               L"A group whose content is 'all' must only appear as the 
content type of a complex type definition.\x00"
+    110               L"When a model group has {compositor} 'all' which 
constitutes the {content type} of a complex type, minOccurs=maxOccurs=1\x00"
+    111               L"In an 'all' schema component, the value of 
minOccurs/maxOccurs of an element must be '0' or '1'.\x00"
+    112               L"Attribute '{0}' already defined in base and should not 
appear in derivation by extension.\x00"
+    113               L"The intensional intersection of {attributes wildcard}s 
must be expressible\x00"
+    114               L"Base type definition does not have any attributes\x00"
+    115               L"Attribute '{0}' has an inconsistent REQUIRED setting 
with that of the base\x00"
+    116               L"Type of attribute '{0}' must be validly derived from 
type of attribute in base\x00"
+    117               L"Attribute '{0}' is either not fixed, or has a 
different value from that of the base\x00"
+    118               L"Attribute '{0}' has invalid target namespace with 
respect to a base wildcard constraint or, base has no wildcard\x00"
+    119               L"An attribute wildcard is present in the derived type, 
but not in the base\x00"
+    120               L"The attribute wildcard in the derived type is not a 
valid subset of that in the base\x00"
+    121               L"Attribute '{0}' cannot modify the 'use' attribute in a 
derived type, if base attribute use is prohibited\x00"
+    122               L"The wildcard attribute in the derived type must be 
identical to or stronger than the one in the base.\x00"
+    123               L"Content of <all> is restricted to elements only. '{0}' 
encountered and ignored.\x00"
+    124               L"Redefined schema '{0}' has a different targetNameSpace 
'{1}'.\x00"
+    125               L"A simpleType child of a <redefine> must have a 
restriction element as a child\x00"
+    126               L"The base attribute of the restriction child of a 
simpleType, must be the same as the redefine simpleType's name attribute\x00"
+    127               L"A complexType child of a <redefine> must have a 
restriction or extension element as a grandchild\x00"
+    128               L"The base attribute of a restriction/extension must be 
the same as the complexType's name attribute in <redefine>\x00"
+    129               L"The group '{0}' which contains a reference to a group 
being redefined must have minOccurs = maxOccurs = 1\x00"
+    130               L"Could not find a declaration in the schema to be 
redefined corresponding to '{0}'\x00"
+    131               L"If a group child of a <redefine> element contains a 
group ref'ing itself, it must have exactly 1 reference.\x00"
+    132               L"If an attributeGroup of a <redefine> element contains 
a reference to itself, such reference must be exactly 1\x00"
+    133               L"A <redefine> element cannot contain a child of type 
'{0}'\x00"
+    134               L"The notation declaration '{0}:{1}' is not found\x00"
+    135               L"More than one identity constraint named '{0}'.\x00"
+    136               L"The content of an identity constraint must match 
(annotation?, selector, field+)\x00"
+    137               L"Key reference declaration '{0}' refers to unknown key 
with name '{1}'.\x00"
+    138               L"Cardinality of fields for keyref '{0}' and key '{1}' 
must match.\x00"
+    139               L"Xpath expression is either missing or empty\x00"
+    140               L"The {value constraint} of an attribute ref is not 
fixed or different from the fixed {value constraint} of '{0}'\x00"
+    141               L"The {type definition} for attribute '{0}={1}' is or is 
derived from ID, and must not have {value constraint}\x00"
+    142               L"More than one attribute derived from type ID cannot 
appear in the same complex type - '{0}' ignored\x00"
+    143               L"More than one attribute derived from type ID cannot 
appear in the same attribute group - '{0}' ignored\x00"
+    144               L"'' is not a legal value for the targetNamespace 
attribute; the attribute must be absent or contain a nonempty value\x00"
+    145               L"{0}\x00"
+    146               L"Invalid Redefine: '{0}' has already been included or 
redefined\x00"
+    147               L"Schema Representation Constraint: Namespace '{0}' is 
referenced without <import> declaration\x00"
+    148               L"An 'all' model group that's part of a complex type 
definition must constitute the entire content type of the definition\x00"
+    149               L"An <annotation> can only contain <appinfo> and 
<documentation> elements\x00"
+    150               L"Invalid facet name: '{0}'\x00"
+    151               L"The root element name of an XML Schema should be 
'schema'.\x00"
+    152               L"Circular substitution groups are disallowed for 
element '{0}'.\x00"
+    153               L"The namespace of element '{0}' must be from the schema 
namespace.\x00"
+    154               L"The {target namespace} of '{0}' must not match 
'http://www.w3.org/2001/XMLSchema-instance'.\x00"
+    155               L"The namespace declaration is invalid.\x00"
+    156               L"Namespace fixup cannot be performed on a DOM Level 1 
Node.\x00"
+    159               L"The parser has encountered more than '{0}' entity 
expansions in this document; this is the limit imposed by the application.\x00"
+    160               L"Expected comment or CDATA\x00"
+    161               L"Expected an attribute name\x00"
+    162               L"Expected a notation name\x00"
+    163               L"Repetition of individual elements is not legal for 
mixed content models\x00"
+    164               L"Expected default attribute declaration, assuming 
#IMPLIED\x00"
+    165               L"Expected equal sign\x00"
+    166               L"Expected an element name\x00"
+    167               L"Comments must start with <!--\x00"
+    168               L"Invalid document structure\x00"
+    169               L"Expected a 'version=', 'encoding=', or 
'standalone='\x00"
+    170               L"Invalid XML version string\x00"
+    171               L"Unsupported XML version, '{0}'\x00"
+    172               L"Unterminated XML decl\x00"
+    173               L"Invalid XML encoding declaration, '{0}'\x00"
+    174               L"Invalid standalone declaration\x00"
+    175               L"Unterminated comment\x00"
+    176               L"Processing instruction name expected\x00"
+    177               L"Unterminated processing instruction\x00"
+    178               L"Invalid character (Unicode: 0x{0})\x00"
+    179               L"Unterminated start tag, '{0}'\x00"
+    180               L"Expected an attribute value\x00"
+    181               L"Unterminated end tag, '{0}'\x00"
+    182               L"Expected type (CDATA, ID, NMTOKEN, etc.), for 
attribute '{0}' of element '{1}'\x00"
+    183               L"Expected end of tag '{0}'\x00"
+    184               L"Expected tag name, comment, PI, or other markup\x00"
+    185               L"Not valid after content\x00"
+    186               L"Expected comment\x00"
+    187               L"Expected comment or processing instruction\x00"
+    188               L"Expected whitespace\x00"
+    189               L"No root element in DOCTYPE\x00"
+    190               L"Expected quoted string\x00"
+    191               L"Expected public id\x00"
+    192               L"Invalid character in public id (Unicode: 0x{0})\x00"
+    193               L"Unterminated DOCTYPE declaration\x00"
+    194               L"Invalid character in internal subset (Unicode: 
0x{0})\x00"
+    195               L"Unexpected whitespace\x00"
+    196               L"Invalid character in attribute value {0} (Unicode: 
0x{1})\x00"
+    197               L"Expected a markup declaration\x00"
+    198               L"Text declaration not legal at this point\x00"
+    199               L"Conditional section in internal subset\x00"
+    200               L"Expected parameter entity name\x00"
+    201               L"Unterminated entity declaration, '{0}'\x00"
+    202               L"Invalid character reference\x00"
+    203               L"Unterminated character reference\x00"
+    204               L"Expected entity name for reference\x00"
+    205               L"Entity '{0}' was not found\x00"
+    206               L"Unparsed entity references, '{0}', not valid at this 
point\x00"
+    207               L"Unterminated entity reference, '{0}'\x00"
+    208               L"Recursive entity expansion, '{0}'\x00"
+    209               L"Partial markup in entity value\x00"
+    210               L"Unterminated element declaration, '{0}'\x00"
+    211               L"Expected content specification expression for element 
'{0}'\x00"
+    212               L"Expected asterisk\x00"
+    213               L"'{0}' is a mixed content model that is not terminated 
properly.\x00"
+    214               L"Expected system or public id\x00"
+    215               L"Unterminated notation declaration\x00"
+    216               L"Expected ',', '|', or ')' characters\x00"
+    217               L"Expected '|' or ')' characters\x00"
+    218               L"Expected ',' or ')' characters or close parenthesis in 
content model of element '{0}'\x00"
+    219               L"Expected enumeration value for attribute '{0}'\x00"
+    220               L"Expected | enumeration separator, or closing paren\x00"
+    221               L"Unterminated entity literal\x00"
+    222               L"There are more end tags than start tags\x00"
+    223               L"Expected an open parenthesis\x00"
+    224               L"The attribute '{0}' is already used in element 
'{1}'\x00"
+    225               L"A '<' character cannot be used in attribute '{0}', 
except through &lt;\x00"
+    226               L"A leading surrogate character was not followed by a 
legal second character\x00"
+    227               L"Expected ']]>' to end a conditional section\x00"
+    228               L"Expected INCLUDE or IGNORE at this point\x00"
+    229               L"Expected [ to follow INCLUDE or IGNORE\x00"
+    230               L"Unexpected end of entity {0}\x00"
+    231               L"A PE propagated out of the int/ext subset, discarding 
extra text\x00"
+    232               L"An extra ] character was found\x00"
+    233               L"PE refs are not allowed inside markup in the internal 
subset\x00"
+    234               L"An entity propagated out of the content section into 
Miscellaneous\x00"
+    235               L"Expected &# to be followed by a numeric character 
value\x00"
+    236               L"Expected an open bracket ('[')\x00"
+    237               L"The sequence ']]>' is not allowed in character 
data\x00"
+    238               L"Illegal sequence '--' in comment\x00"
+    239               L"Unterminated CDATA section\x00"
+    240               L"Expected NDATA\x00"
+    241               L"NDATA is not legal for parameter entities\x00"
+    242               L"Hex radix character refs must use 'x', not 'X'\x00"
+    243               L"'{0}' has already been set\x00"
+    244               L"The XMLDecl strings must be in the order: version, 
encoding, standalone\x00"
+    245               L"External entities cannot be referred to from attribute 
values\x00"
+    246               L"The XML or Text decl must start with '<?xml ', not 
'<?XML '\x00"
+    247               L"Expected a literal entity value or PUBLIC/SYSTEM 
id\x00"
+    248               L"'{0}' is not a valid digit for the indicated radix\x00"
+    249               L"The input ended before all started tags were ended. 
Last tag started was '{0}'\x00"
+    250               L"Nested CDATA sections are not allowed\x00"
+    251               L"The prefix '{0}' has not been mapped to any URI\x00"
+    252               L"The start and the end tag were in the different 
entities\x00"
+    253               L"The main XML document cannot be empty\x00"
+    254               L"CDATA is not allowed outside the root element\x00"
+    255               L"Got an unexpected trailing surrogate character\x00"
+    256               L"No processing instruction starts with 'xml'\x00"
+    257               L"The XML or Text declaration must start at line/column 
1/1\x00"
+    258               L"The 'version=' string is required in an XMLDecl\x00"
+    259               L"The 'standalone=' string is only allowed in the main 
XML entity\x00"
+    260               L"The 'encoding=' string is required in an Text Decl\x00"
+    261               L"Colons are not allowed in this name when namespaces 
are enabled\x00"
+    262               L"{0}\x00"
+    263               L"The schemaLocation attribute does not contain pairs of 
values.\x00"
+    264               L"Fatal error encountered during schema scan\x00"
+    265               L"Reference to external entity declaration '{0}' is not 
allowed in a standalone document.\x00"
+    266               L"Partial markup in parameter entity replacement text in 
a complete declaration.\x00"
+    267               L"The value of the attribute '{0}' is invalid. Prefixed 
namespace bindings may not be empty.\x00"
+    268               L"The prefix 'xmlns' cannot be bound to any namespace 
explicitly.\x00"
+    269               L"The namespace for 'xmlns' cannot be bound to any 
prefix explicitly.\x00"
+    270               L"The prefix 'xml' cannot be bound to any namespace 
other than its usual namespace.\x00"
+    271               L"The namespace for 'xml' cannot be bound to any prefix 
other than 'xml'.\x00"
+    272               L"Element '{0}' cannot have 'xmlns' as its prefix.\x00"
+    273               L"Complex Type Definition Representation OK - 2.2: 
<restriction> must have a <simpleType> child.\x00"
+    274               L"DOCTYPE root element qname beginning with '{0}' 
invalid\x00"
+    275               L"Element qname beginning with '{0}' invalid\x00"
+    276               L"Attribute qname beginning with '{0}' invalid\x00"
+    277               L"Entity qname for reference beginning '{0}' invalid\x00"
+    278               L"Already seen doctype\x00"
+    279               L"Found a fallback element not a direct child of include 
element\x00"
+    280               L"include element found without href attribute\x00"
+    281               L"Found an include element with xpointer specification. 
XPointer not yet supported\x00"
+    282               L"Invalid parse attribute value '{0}' found on include 
element - only text or xml is valid\x00"
+    283               L"Multiple fallback elements found in include element in 
document '{0}'\x00"
+    284               L"Include failed, no fallback found in document 
'{0}'\x00"
+    285               L"Circular inclusion document '{0}' includes previously 
included document\x00"
+    286               L"Circular inclusion document '{0}' includes itself\x00"
+    287               L"Element '{0}' is not allowed as a child of an 
xi:include element\x00"
+    288               L"Included notation '{0}' conflicts with a notation 
already defined\x00"
+    289               L"Included entity '{0}' conflicts with an entity already 
defined\x00"
 END
 STRINGTABLE DISCARDABLE
 BEGIN

Modified: xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp?rev=645555&r1=645554&r2=645555&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp 
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp Mon 
Apr  7 08:10:07 2008
@@ -53,16 +53,6 @@
     chLatin_e, chLatin_d, chNull
 };
 
-static const XMLCh fgLocal[] =
-{
-    chLatin_l, chLatin_o, chLatin_c, chLatin_a, chLatin_l, chNull
-};
-
-static const XMLCh fgGlobal[] =
-{
-    chLatin_g, chLatin_l, chLatin_o, chLatin_b, chLatin_a, chLatin_l, chNull
-};
-
 // ---------------------------------------------------------------------------
 //  Static member data initialization
 // ---------------------------------------------------------------------------
@@ -198,7 +188,6 @@
         );
     }
 
-    const XMLCh*     contextStr = (isTopLevel) ? fgGlobal : fgLocal;
     DOMNamedNodeMap* eltAttrs = elem->getAttributes();
     unsigned int     attrCount = eltAttrs->getLength();
     XMLByte          attList[A_Count];
@@ -239,7 +228,8 @@
                 XMLString::equals(elemName, 
SchemaSymbols::fgELT_DOCUMENTATION)) {
 
                 schema->reportSchemaError(elem, XMLUni::fgXMLErrDomain,
-                    XMLErrs::AttributeDisallowed, attName, contextStr, 
elemName);
+                                          
isTopLevel?XMLErrs::AttributeDisallowedGlobal:XMLErrs::AttributeDisallowedLocal,
 
+                                          attName, elemName);
             }
             else if (nonXSAttList)
             {
@@ -263,7 +253,8 @@
         catch(...) {
 
             schema->reportSchemaError(elem, XMLUni::fgXMLErrDomain,
-                XMLErrs::AttributeDisallowed, attName, contextStr, elemName);
+                                      
isTopLevel?XMLErrs::AttributeDisallowedGlobal:XMLErrs::AttributeDisallowedLocal,
 
+                                      attName, elemName);
             bContinue=true;
         }
         if(bContinue)
@@ -283,7 +274,8 @@
         }
         else {
             schema->reportSchemaError(elem, XMLUni::fgXMLErrDomain,
-                XMLErrs::AttributeDisallowed, attName, contextStr, elemName);
+                                      
isTopLevel?XMLErrs::AttributeDisallowedGlobal:XMLErrs::AttributeDisallowedLocal,
 
+                                      attName, elemName);
         }
     }
 
@@ -293,8 +285,9 @@
     for (unsigned int j=0; j < A_Count; j++) {
 
         if ((fgElemAttTable[elemContext][j] & Att_Required) && attList[j] == 
0) {
-            schema->reportSchemaError(elem, XMLUni::fgXMLErrDomain, 
XMLErrs::AttributeRequired,
-                                      fAttNames[j], contextStr, elemName);
+            schema->reportSchemaError(elem, XMLUni::fgXMLErrDomain, 
+                                      
isTopLevel?XMLErrs::AttributeRequiredGlobal:XMLErrs::AttributeRequiredLocal, 
+                                      fAttNames[j], elemName);
         }
     }
 }

Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=645555&r1=645554&r2=645555&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Mon Apr  7 
08:10:07 2008
@@ -56,7 +56,6 @@
 #include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/util/XMLEntityResolver.hpp>
 #include <xercesc/util/XMLUri.hpp>
-#include <xercesc/util/PSVIUni.hpp>
 #include <xercesc/framework/psvi/XSAnnotation.hpp>
 #include <xercesc/framework/MemBufInputSource.hpp>
 #include <xercesc/internal/XSAXMLScanner.hpp>
@@ -1217,8 +1216,8 @@
         return 0;
     }
     else if(!topLevel && !nameEmpty) {
-        reportSchemaError(childElem, XMLUni::fgXMLErrDomain, 
XMLErrs::AttributeDisallowed, 
-                          SchemaSymbols::fgATT_NAME, PSVIUni::fgLocal, 
childElem->getLocalName());
+        reportSchemaError(childElem, XMLUni::fgXMLErrDomain, 
XMLErrs::AttributeDisallowedLocal, 
+                          SchemaSymbols::fgATT_NAME, 
childElem->getLocalName());
         return 0;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to