cargilld 2004/12/01 09:34:28
Modified: c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
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:
Update two error messages: add missing parameter, remove extra parameter.
Revision Changes Path
1.42 +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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- en_US.txt 9 Nov 2004 03:11:18 -0000 1.41
+++ en_US.txt 1 Dec 2004 17:34:27 -0000 1.42
@@ -352,7 +352,7 @@
"{0} not allowed if the order is all. " ,
"Datatype qualifiers can only be used if you specify a type
attribute. " ,
"The datatype qualifier {0} is not supported. " ,
- "Error: {0} content must be one of element, group,
modelGroupRef. Saw {1} " ,
+ "'{0}' is not allowed for the content of a 'choice' model
group. Only 'element', 'group', 'choice', 'sequence' and 'any' are allowed. " ,
"Unknown base type {0} for type {1}. " ,
"Can only have one of type and ref attributes. " ,
"A <{0}> declaration that has a ref attribute, cannot have
child content. " ,
@@ -362,7 +362,7 @@
"Datatype error: Type:{0}, Message:{1}. " ,
"Schema error: Type:{0}, Message:{1} " ,
"The type of the element has already been declared. " ,
- "Prohibited Attribute is found. " ,
+ "Prohibited Attribute {0} is found. " ,
"Illegal xml:space declaration. " ,
"{0} is not a boolean. " ,
"{0} is not a decimal. " ,
1.62 +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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Version.rc 9 Nov 2004 03:13:28 -0000 1.61
+++ Version.rc 1 Dec 2004 17:34:28 -0000 1.62
@@ -443,7 +443,7 @@
16420
L"\x007B\x0030\x007D\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0069\x0066\x0020\x0074\x0068\x0065\x0020\x006F\x0072\x0064\x0065\x0072\x0020\x0069\x0073\x0020\x0061\x006C\x006C\x002E\x00"
16421
L"\x0044\x0061\x0074\x0061\x0074\x0079\x0070\x0065\x0020\x0071\x0075\x0061\x006C\x0069\x0066\x0069\x0065\x0072\x0073\x0020\x0063\x0061\x006E\x0020\x006F\x006E\x006C\x0079\x0020\x0062\x0065\x0020\x0075\x0073\x0065\x0064\x0020\x0069\x0066\x0020\x0079\x006F\x0075\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0079\x0020\x0061\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x002E\x00"
16422
L"\x0054\x0068\x0065\x0020\x0064\x0061\x0074\x0061\x0074\x0079\x0070\x0065\x0020\x0071\x0075\x0061\x006C\x0069\x0066\x0069\x0065\x0072\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x002E\x00"
- 16423
L"\x0045\x0072\x0072\x006F\x0072\x003A\x0020\x007B\x0030\x007D\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x006F\x006E\x0065\x0020\x006F\x0066\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x002C\x0020\x0067\x0072\x006F\x0075\x0070\x002C\x0020\x006D\x006F\x0064\x0065\x006C\x0047\x0072\x006F\x0075\x0070\x0052\x0065\x0066\x002E\x0020\x0053\x0061\x0077\x0020\x007B\x0031\x007D\x00"
+ 16423
L"\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0066\x006F\x0072\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0061\x0020\x0027\x0063\x0068\x006F\x0069\x0063\x0065\x0027\x0020\x006D\x006F\x0064\x0065\x006C\x0020\x0067\x0072\x006F\x0075\x0070\x002E\x0020\x0020\x004F\x006E\x006C\x0079\x0020\x0027\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0027\x002C\x0020\x0027\x0067\x0072\x006F\x0075\x0070\x0027\x002C\x0020\x0027\x0063\x0068\x006F\x0069\x0063\x0065\x0027\x002C\x0020\x0027\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0061\x006E\x0079\x0027\x0020\x0061\x0072\x0065\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x002E\x00"
16424
L"\x0055\x006E\x006B\x006E\x006F\x0077\x006E\x0020\x0062\x0061\x0073\x0065\x0020\x0074\x0079\x0070\x0065\x0020\x007B\x0030\x007D\x0020\x0066\x006F\x0072\x0020\x0074\x0079\x0070\x0065\x0020\x007B\x0031\x007D\x002E\x00"
16425
L"\x0043\x0061\x006E\x0020\x006F\x006E\x006C\x0079\x0020\x0068\x0061\x0076\x0065\x0020\x006F\x006E\x0065\x0020\x006F\x0066\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x006E\x0064\x0020\x0072\x0065\x0066\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0073\x002E\x00"
16426
L"\x0041\x0020\x003C\x007B\x0030\x007D\x003E\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0020\x0074\x0068\x0061\x0074\x0020\x0068\x0061\x0073\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x002C\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x002E\x00"
@@ -453,7 +453,7 @@
16430
L"\x0044\x0061\x0074\x0061\x0074\x0079\x0070\x0065\x0020\x0065\x0072\x0072\x006F\x0072\x003A\x0020\x0054\x0079\x0070\x0065\x003A\x007B\x0030\x007D\x002C\x0020\x004D\x0065\x0073\x0073\x0061\x0067\x0065\x003A\x007B\x0031\x007D\x002E\x00"
16431
L"\x0053\x0063\x0068\x0065\x006D\x0061\x0020\x0065\x0072\x0072\x006F\x0072\x003A\x0020\x0054\x0079\x0070\x0065\x003A\x007B\x0030\x007D\x002C\x0020\x004D\x0065\x0073\x0073\x0061\x0067\x0065\x003A\x007B\x0031\x007D\x00"
16432
L"\x0054\x0068\x0065\x0020\x0074\x0079\x0070\x0065\x0020\x006F\x0066\x0020\x0074\x0068\x0065\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0068\x0061\x0073\x0020\x0061\x006C\x0072\x0065\x0061\x0064\x0079\x0020\x0062\x0065\x0065\x006E\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x002E\x00"
- 16433
L"\x0050\x0072\x006F\x0068\x0069\x0062\x0069\x0074\x0065\x0064\x0020\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0069\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x002E\x00"
+ 16433
L"\x0050\x0072\x006F\x0068\x0069\x0062\x0069\x0074\x0065\x0064\x0020\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x002E\x00"
16434
L"\x0049\x006C\x006C\x0065\x0067\x0061\x006C\x0020\x0078\x006D\x006C\x003A\x0073\x0070\x0061\x0063\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x002E\x00"
16435
L"\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x0020\x0062\x006F\x006F\x006C\x0065\x0061\x006E\x002E\x00"
16436
L"\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x0020\x0064\x0065\x0063\x0069\x006D\x0061\x006C\x002E\x00"
1.32 +5 -4
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XercesMessages_en_US.hpp 9 Nov 2004 03:11:54 -0000 1.31
+++ XercesMessages_en_US.hpp 1 Dec 2004 17:34:28 -0000 1.32
@@ -749,9 +749,10 @@
0x0064,0x0020,0x0069,0x0066,0x0020,0x0079,0x006F,0x0075,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0079,0x0020,0x0061,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x002E,0x00
}
, {
0x0054,0x0068,0x0065,0x0020,0x0064,0x0061,0x0074,0x0061,0x0074,0x0079,0x0070,0x0065,0x0020,0x0071,0x0075,0x0061,0x006C,0x0069,0x0066,0x0069,0x0065,0x0072,0x0020,0x007B,0x0030,0x007D,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,
0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x002E,0x00 }
- , {
0x0045,0x0072,0x0072,0x006F,0x0072,0x003A,0x0020,0x007B,0x0030,0x007D,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x006F,0x006E,0x0065,0x0020,0x006F,0x0066,0x0020,0x0065,
-
0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x002C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x002C,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x0047,0x0072,0x006F,0x0075,0x0070,0x0052,0x0065,0x0066,0x002E,0x0020,0x0053,0x0061,0x0077,0x0020,0x007B,
- 0x0031,0x007D,0x00 }
+ , {
0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0066,0x006F,0x0072,0x0020,0x0074,0x0068,0x0065,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,
+
0x0074,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x0027,0x0063,0x0068,0x006F,0x0069,0x0063,0x0065,0x0027,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x0020,0x0067,0x0072,0x006F,0x0075,0x0070,0x002E,0x0020,0x0020,0x004F,0x006E,0x006C,0x0079,0x0020,
+
0x0027,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0027,0x002C,0x0020,0x0027,0x0067,0x0072,0x006F,0x0075,0x0070,0x0027,0x002C,0x0020,0x0027,0x0063,0x0068,0x006F,0x0069,0x0063,0x0065,0x0027,0x002C,0x0020,0x0027,0x0073,0x0065,0x0071,0x0075,
+
0x0065,0x006E,0x0063,0x0065,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0061,0x006E,0x0079,0x0027,0x0020,0x0061,0x0072,0x0065,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x002E,0x00
}
, {
0x0055,0x006E,0x006B,0x006E,0x006F,0x0077,0x006E,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x007B,0x0030,0x007D,0x0020,0x0066,0x006F,0x0072,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x007B,0x0031,0x007D,0x002E,
0x00 }
, {
0x0043,0x0061,0x006E,0x0020,0x006F,0x006E,0x006C,0x0079,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x006F,0x006E,0x0065,0x0020,0x006F,0x0066,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0061,0x006E,0x0064,0x0020,0x0072,0x0065,0x0066,0x0020,0x0061,
@@ -770,7 +771,7 @@
0x00 }
, {
0x0054,0x0068,0x0065,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x006F,0x0066,0x0020,0x0074,0x0068,0x0065,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0068,0x0061,0x0073,0x0020,0x0061,0x006C,0x0072,0x0065,0x0061,0x0064,0x0079,
0x0020,0x0062,0x0065,0x0065,0x006E,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0065,0x0064,0x002E,0x00
}
- , {
0x0050,0x0072,0x006F,0x0068,0x0069,0x0062,0x0069,0x0074,0x0065,0x0064,0x0020,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0069,0x0073,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x002E,0x00
}
+ , {
0x0050,0x0072,0x006F,0x0068,0x0069,0x0062,0x0069,0x0074,0x0065,0x0064,0x0020,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x007B,0x0030,0x007D,0x0020,0x0069,0x0073,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x002E,0x00
}
, {
0x0049,0x006C,0x006C,0x0065,0x0067,0x0061,0x006C,0x0020,0x0078,0x006D,0x006C,0x003A,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x002E,0x00
}
, {
0x007B,0x0030,0x007D,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x0020,0x0062,0x006F,0x006F,0x006C,0x0065,0x0061,0x006E,0x002E,0x00
}
, {
0x007B,0x0030,0x007D,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x0020,0x0064,0x0065,0x0063,0x0069,0x006D,0x0061,0x006C,0x002E,0x00
}
1.31 +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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XercesMessages_en_US.Msg 9 Nov 2004 03:12:25 -0000 1.30
+++ XercesMessages_en_US.Msg 1 Dec 2004 17:34:28 -0000 1.31
@@ -341,7 +341,7 @@
36 {0} not allowed if the order is all.
37 Datatype qualifiers can only be used if you specify a type attribute.
38 The datatype qualifier {0} is not supported.
-39 Error: {0} content must be one of element, group, modelGroupRef. Saw {1}
+39 '{0}' is not allowed for the content of a 'choice' model group. Only
'element', 'group', 'choice', 'sequence' and 'any' are allowed.
40 Unknown base type {0} for type {1}.
41 Can only have one of type and ref attributes.
42 A <{0}> declaration that has a ref attribute, cannot have child content.
@@ -351,7 +351,7 @@
46 Datatype error: Type:{0}, Message:{1}.
47 Schema error: Type:{0}, Message:{1}
48 The type of the element has already been declared.
-49 Prohibited Attribute is found.
+49 Prohibited Attribute {0} is found.
50 Illegal xml:space declaration.
51 {0} is not a boolean.
52 {0} is not a decimal.
1.50 +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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- XMLErrList_EN_US.Xml 9 Nov 2004 03:09:58 -0000 1.49
+++ XMLErrList_EN_US.Xml 1 Dec 2004 17:34:28 -0000 1.50
@@ -354,7 +354,7 @@
<Message Id="OrderIsAll" Text="{0} not allowed if the order is
all."/>
<Message Id="DatatypeWithType" Text="Datatype qualifiers can
only be used if you specify a type attribute."/>
<Message Id="DatatypeQualUnsupported" Text="The datatype
qualifier {0} is not supported."/>
- <Message Id="GroupContentRestricted" Text="Error: {0} content
must be one of element, group, modelGroupRef. Saw {1}"/>
+ <Message Id="GroupContentRestricted" Text="'{0}' is not allowed
for the content of a 'choice' model group. Only 'element', 'group', 'choice',
'sequence' and 'any' are allowed."/>
<Message Id="UnknownBaseDatatype" Text="Unknown base type {0}
for type {1}."/>
<Message Id="OneOfTypeRefArchRef" Text="Can only have one of
type and ref attributes."/>
<Message Id="NoContentForRef" Text="A <{0}> declaration
that has a ref attribute, cannot have child content."/>
@@ -364,7 +364,7 @@
<Message Id="DatatypeError" Text="Datatype error: Type:{0},
Message:{1}."/>
<Message Id="SchemaError" Text="Schema error: Type:{0},
Message:{1}"/>
<Message Id="TypeAlreadySet" Text="The type of the element has
already been declared."/>
- <Message Id="ProhibitedAttributePresent" Text="Prohibited
Attribute is found."/>
+ <Message Id="ProhibitedAttributePresent" Text="Prohibited
Attribute {0} is found."/>
<Message Id="IllegalXMLSpace" Text="Illegal xml:space
declaration."/>
<Message Id="NotBoolean" Text="{0} is not a boolean."/>
<Message Id="NotDecimal" Text="{0} is not a decimal."/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
