cargilld 2004/12/13 13:31:45
Modified: c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/validators/schema TraverseSchema.cpp
c/src/xercesc/util/Platforms/Win32 Version.rc
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
Log:
Error message update.
Revision Changes Path
1.46 +2 -2
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- en_US.txt 9 Dec 2004 14:45:33 -0000 1.45
+++ en_US.txt 13 Dec 2004 21:31:43 -0000 1.46
@@ -50,14 +50,14 @@
"Invalid child following the complexContent child in the
complexType " ,
"The 'block' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found " ,
"The 'final' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found " ,
- "An attribute cannot have both 'fixed' and 'default' present at
the same time - default used " ,
+ "Attribute '{0}' cannot have both 'fixed' and 'default' present
at the same time. " ,
"If default and use are both present, use must have the value
'optional'. " ,
"Local attribute:{0} has also a ref defined - name ignored " ,
"Global attribute:'{0}' cannot have a ref defined " ,
"Error: Attribute '{0}' declared more than once in the same
scope- ignoring " ,
"Attribute declarations may not contain both a type and a
simpleType declaration " ,
"SimpleType ({0}:{1}) for attribute: {2} not found " ,
- "An element cannot have both 'fixed' and 'default' present at
the same time " ,
+ "Element '{0}' cannot have both 'fixed' and 'default' present
at the same time. " ,
"{0}:'{1}' has also a ref defined - name ignored " ,
"ref cannot appear with any of type, abstract, block, final,
nillable, default or fixed " ,
"Invalid {0} name:'{1}' - declaration ignored " ,
1.128 +3 -3
xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
Index: TraverseSchema.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- TraverseSchema.cpp 9 Dec 2004 14:45:34 -0000 1.127
+++ TraverseSchema.cpp 13 Dec 2004 21:31:44 -0000 1.128
@@ -2199,7 +2199,7 @@
if (fixedVal) {
fixedVal = 0;
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeDefaultFixedValue);
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeDefaultFixedValue, name);
}
if ((useVal && *useVal)
@@ -8464,7 +8464,7 @@
// if both default and fixed, emit an error
if (valueConstraint)
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::ElementWithFixedAndDefault);
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::ElementWithFixedAndDefault, getElementAttValue(elem,
SchemaSymbols::fgATT_NAME));
// set constraint value to the fixed one
valueConstraint = fixedVal;
1.66 +2 -2 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Version.rc 9 Dec 2004 14:45:33 -0000 1.65
+++ Version.rc 13 Dec 2004 21:31:44 -0000 1.66
@@ -147,14 +147,14 @@
46
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x0066\x006F\x006C\x006C\x006F\x0077\x0069\x006E\x0067\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0043\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x00"
47
L"\x0054\x0068\x0065\x0020\x0027\x0062\x006C\x006F\x0063\x006B\x0027\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x006F\x0066\x0020\x0061\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0023\x0061\x006C\x006C\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0028\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x002C\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0029\x003B\x0020\x007B\x0030\x007D\x0020\x0077\x0061\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x00"
48
L"\x0054\x0068\x0065\x0020\x0027\x0066\x0069\x006E\x0061\x006C\x0027\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x006F\x0066\x0020\x0061\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0023\x0061\x006C\x006C\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0028\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x002C\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0029\x003B\x0020\x007B\x0030\x007D\x0020\x0077\x0061\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x00"
- 49
L"\x0041\x006E\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x0020\x002D\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x0075\x0073\x0065\x0064\x00"
+ 49
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x002E\x00"
50
L"\x0049\x0066\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x0061\x006E\x0064\x0020\x0075\x0073\x0065\x0020\x0061\x0072\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x002C\x0020\x0075\x0073\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0074\x0068\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0027\x006F\x0070\x0074\x0069\x006F\x006E\x0061\x006C\x0027\x002E\x00"
51
L"\x004C\x006F\x0063\x0061\x006C\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x007B\x0030\x007D\x0020\x0068\x0061\x0073\x0020\x0061\x006C\x0073\x006F\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0064\x0065\x0066\x0069\x006E\x0065\x0064\x0020\x002D\x0020\x006E\x0061\x006D\x0065\x0020\x0069\x0067\x006E\x006F\x0072\x0065\x0064\x00"
52
L"\x0047\x006C\x006F\x0062\x0061\x006C\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0064\x0065\x0066\x0069\x006E\x0065\x0064\x00"
53
L"\x0045\x0072\x0072\x006F\x0072\x003A\x0020\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x0020\x006D\x006F\x0072\x0065\x0020\x0074\x0068\x0061\x006E\x0020\x006F\x006E\x0063\x0065\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0073\x0063\x006F\x0070\x0065\x002D\x0020\x0069\x0067\x006E\x006F\x0072\x0069\x006E\x0067\x00"
54
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0073\x0020\x006D\x0061\x0079\x0020\x006E\x006F\x0074\x0020\x0063\x006F\x006E\x0074\x0061\x0069\x006E\x0020\x0062\x006F\x0074\x0068\x0020\x0061\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x006E\x0064\x0020\x0061\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x00"
55
L"\x0053\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0028\x007B\x0030\x007D\x003A\x007B\x0031\x007D\x0029\x0020\x0066\x006F\x0072\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x0020\x007B\x0032\x007D\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x0075\x006E\x0064\x00"
- 56
L"\x0041\x006E\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x00"
+ 56
L"\x0045\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x002E\x00"
57
L"\x007B\x0030\x007D\x003A\x0027\x007B\x0031\x007D\x0027\x0020\x0068\x0061\x0073\x0020\x0061\x006C\x0073\x006F\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0064\x0065\x0066\x0069\x006E\x0065\x0064\x0020\x002D\x0020\x006E\x0061\x006D\x0065\x0020\x0069\x0067\x006E\x006F\x0072\x0065\x0064\x00"
58
L"\x0072\x0065\x0066\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0061\x0070\x0070\x0065\x0061\x0072\x0020\x0077\x0069\x0074\x0068\x0020\x0061\x006E\x0079\x0020\x006F\x0066\x0020\x0074\x0079\x0070\x0065\x002C\x0020\x0061\x0062\x0073\x0074\x0072\x0061\x0063\x0074\x002C\x0020\x0062\x006C\x006F\x0063\x006B\x002C\x0020\x0066\x0069\x006E\x0061\x006C\x002C\x0020\x006E\x0069\x006C\x006C\x0061\x0062\x006C\x0065\x002C\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x006F\x0072\x0020\x0066\x0069\x0078\x0065\x0064\x00"
59
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x007B\x0030\x007D\x0020\x006E\x0061\x006D\x0065\x003A\x0027\x007B\x0031\x007D\x0027\x0020\x002D\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0020\x0069\x0067\x006E\x006F\x0072\x0065\x0064\x00"
1.36 +6 -6
xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XercesMessages_en_US.hpp 9 Dec 2004 14:45:33 -0000 1.35
+++ XercesMessages_en_US.hpp 13 Dec 2004 21:31:45 -0000 1.36
@@ -109,9 +109,9 @@
, {
0x0054,0x0068,0x0065,0x0020,0x0027,0x0066,0x0069,0x006E,0x0061,0x006C,0x0027,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x0063,
0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0054,0x0079,0x0070,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0023,0x0061,0x006C,0x006C,0x0020,0x007C,0x0020,0x006C,0x0069,0x0073,0x0074,0x0028,0x0072,0x0065,0x0073,0x0074,
0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x002C,0x0065,0x0078,0x0074,0x0065,0x006E,0x0073,0x0069,0x006F,0x006E,0x0029,0x003B,0x0020,0x007B,0x0030,0x007D,0x0020,0x0077,0x0061,0x0073,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00
}
- , {
0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0027,0x0066,0x0069,0x0078,0x0065,
-
0x0064,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0027,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0061,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,0x0073,0x0061,0x006D,
-
0x0065,0x0020,0x0074,0x0069,0x006D,0x0065,0x0020,0x002D,0x0020,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0020,0x0075,0x0073,0x0065,0x0064,0x00
}
+ , {
0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0027,0x0066,
+
0x0069,0x0078,0x0065,0x0064,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0027,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0061,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,
+
0x0073,0x0061,0x006D,0x0065,0x0020,0x0074,0x0069,0x006D,0x0065,0x002E,0x00 }
, {
0x0049,0x0066,0x0020,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0020,0x0061,0x006E,0x0064,0x0020,0x0075,0x0073,0x0065,0x0020,0x0061,0x0072,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,
0x002C,0x0020,0x0075,0x0073,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0074,0x0068,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x0027,0x006F,0x0070,0x0074,0x0069,0x006F,0x006E,0x0061,0x006C,
0x0027,0x002E,0x00 }
@@ -127,9 +127,9 @@
0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x00 }
, {
0x0053,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0028,0x007B,0x0030,0x007D,0x003A,0x007B,0x0031,0x007D,0x0029,0x0020,0x0066,0x006F,0x0072,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003A,
0x0020,0x007B,0x0032,0x007D,0x0020,0x006E,0x006F,0x0074,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00
}
- , {
0x0041,0x006E,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0027,0x0066,0x0069,0x0078,0x0065,0x0064,0x0027,
-
0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0027,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0061,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,0x0073,0x0061,0x006D,0x0065,0x0020,
- 0x0074,0x0069,0x006D,0x0065,0x00 }
+ , {
0x0045,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0027,0x0066,0x0069,0x0078,
+
0x0065,0x0064,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0027,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0061,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,0x0073,0x0061,
+ 0x006D,0x0065,0x0020,0x0074,0x0069,0x006D,0x0065,0x002E,0x00 }
, {
0x007B,0x0030,0x007D,0x003A,0x0027,0x007B,0x0031,0x007D,0x0027,0x0020,0x0068,0x0061,0x0073,0x0020,0x0061,0x006C,0x0073,0x006F,0x0020,0x0061,0x0020,0x0072,0x0065,0x0066,0x0020,0x0064,0x0065,0x0066,0x0069,0x006E,0x0065,0x0064,0x0020,0x002D,0x0020,
0x006E,0x0061,0x006D,0x0065,0x0020,0x0069,0x0067,0x006E,0x006F,0x0072,0x0065,0x0064,0x00
}
, {
0x0072,0x0065,0x0066,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0061,0x0070,0x0070,0x0065,0x0061,0x0072,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0061,0x006E,0x0079,0x0020,0x006F,0x0066,0x0020,0x0074,0x0079,0x0070,0x0065,0x002C,
1.35 +2 -2
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Index: XercesMessages_en_US.Msg
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XercesMessages_en_US.Msg 9 Dec 2004 14:45:33 -0000 1.34
+++ XercesMessages_en_US.Msg 13 Dec 2004 21:31:45 -0000 1.35
@@ -45,14 +45,14 @@
46 Invalid child following the complexContent child in the complexType
47 The 'block' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found
48 The 'final' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found
-49 An attribute cannot have both 'fixed' and 'default' present at the same
time - default used
+49 Attribute '{0}' cannot have both 'fixed' and 'default' present at the
same time.
50 If default and use are both present, use must have the value 'optional'.
51 Local attribute:{0} has also a ref defined - name ignored
52 Global attribute:'{0}' cannot have a ref defined
53 Error: Attribute '{0}' declared more than once in the same scope-
ignoring
54 Attribute declarations may not contain both a type and a simpleType
declaration
55 SimpleType ({0}:{1}) for attribute: {2} not found
-56 An element cannot have both 'fixed' and 'default' present at the same
time
+56 Element '{0}' cannot have both 'fixed' and 'default' present at the same
time.
57 {0}:'{1}' has also a ref defined - name ignored
58 ref cannot appear with any of type, abstract, block, final, nillable,
default or fixed
59 Invalid {0} name:'{1}' - declaration ignored
1.54 +2 -2 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- XMLErrList_EN_US.Xml 9 Dec 2004 14:45:33 -0000 1.53
+++ XMLErrList_EN_US.Xml 13 Dec 2004 21:31:45 -0000 1.54
@@ -55,14 +55,14 @@
<Message Id="InvalidChildFollowingConplexContent" Text="Invalid
child following the complexContent child in the complexType"/>
<Message Id="InvalidComplexTypeBlockValue" Text="The 'block'
attribute values of a complexType must be #all | list(restriction,extension);
{0} was found"/>
<Message Id="InvalidComplexTypeFinalValue" Text="The 'final'
attribute values of a complexType must be #all | list(restriction,extension);
{0} was found"/>
- <Message Id="AttributeDefaultFixedValue" Text="An attribute
cannot have both 'fixed' and 'default' present at the same time - default
used"/>
+ <Message Id="AttributeDefaultFixedValue" Text="Attribute '{0}'
cannot have both 'fixed' and 'default' present at the same time."/>
<Message Id="NotOptionalDefaultAttValue" Text="If default and
use are both present, use must have the value 'optional'."/>
<Message Id="LocalAttributeWithNameRef" Text="Local
attribute:{0} has also a ref defined - name ignored"/>
<Message Id="GlobalAttributeWithNameRef" Text="Global
attribute:'{0}' cannot have a ref defined"/>
<Message Id="DuplicateAttribute" Text="Error: Attribute '{0}'
declared more than once in the same scope- ignoring"/>
<Message Id="AttributeWithTypeAndSimpleType" Text="Attribute
declarations may not contain both a type and a simpleType declaration"/>
<Message Id="AttributeSimpleTypeNotFound" Text="SimpleType
({0}:{1}) for attribute: {2} not found"/>
- <Message Id="ElementWithFixedAndDefault" Text="An element cannot
have both 'fixed' and 'default' present at the same time"/>
+ <Message Id="ElementWithFixedAndDefault" Text="Element '{0}'
cannot have both 'fixed' and 'default' present at the same time."/>
<Message Id="DeclarationWithNameRef" Text="{0}:'{1}' has also a
ref defined - name ignored"/>
<Message Id="BadAttWithRef" Text="ref cannot appear with any of
type, abstract, block, final, nillable, default or fixed"/>
<Message Id="InvalidDeclarationName" Text="Invalid {0}
name:'{1}' - declaration ignored"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
