cargilld 2004/10/28 16:01:31
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:
Add missing parameter to three error messages.
Revision Changes Path
1.40 +3 -3 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- en_US.txt 16 Sep 2004 13:32:04 -0000 1.39
+++ en_US.txt 28 Oct 2004 23:01:30 -0000 1.40
@@ -201,7 +201,7 @@
"Unexpected text before root element " ,
"Unterminated start tag, '{0}' " ,
"Expected an attribute value " ,
- "Unterminated end tag " ,
+ "Unterminated end tag, '{0}' " ,
"Expected type (CDATA, ID, NMTOKEN, ..), for attribute '{0}' of
element '{1}' " ,
"Expected end of tag '{0}' " ,
"Expected tag name, comment, PI, or other markup " ,
@@ -230,8 +230,8 @@
"Expected entity name for reference " ,
"Entity '{0}' was not found " ,
"Unparsed entity references, '{0}', not valid here " ,
- "Unterminated entity reference " ,
- "Recursive entity expansion " ,
+ "Unterminated entity reference, '{0}' " ,
+ "Recursive entity expansion, '{0}' " ,
"Partial markup in entity value " ,
"Unterminated element declaration, '{0}' " ,
"Expected content specification expression for element '{0}' " ,
1.60 +4 -3 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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Version.rc 26 Oct 2004 09:32:47 -0000 1.59
+++ Version.rc 28 Oct 2004 23:01:30 -0000 1.60
@@ -296,7 +296,7 @@
197
L"\x0055\x006E\x0065\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0074\x0065\x0078\x0074\x0020\x0062\x0065\x0066\x006F\x0072\x0065\x0020\x0072\x006F\x006F\x0074\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x00"
198
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0073\x0074\x0061\x0072\x0074\x0020\x0074\x0061\x0067\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x00"
199
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0061\x006E\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x00"
- 200
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0065\x006E\x0064\x0020\x0074\x0061\x0067\x00"
+ 200
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0065\x006E\x0064\x0020\x0074\x0061\x0067\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x00"
201
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0074\x0079\x0070\x0065\x0020\x0028\x0043\x0044\x0041\x0054\x0041\x002C\x0020\x0049\x0044\x002C\x0020\x004E\x004D\x0054\x004F\x004B\x0045\x004E\x002C\x0020\x002E\x002E\x0029\x002C\x0020\x0066\x006F\x0072\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006F\x0066\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0031\x007D\x0027\x00"
202
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0065\x006E\x0064\x0020\x006F\x0066\x0020\x0074\x0061\x0067\x0020\x0027\x007B\x0030\x007D\x0027\x00"
203
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0074\x0061\x0067\x0020\x006E\x0061\x006D\x0065\x002C\x0020\x0063\x006F\x006D\x006D\x0065\x006E\x0074\x002C\x0020\x0050\x0049\x002C\x0020\x006F\x0072\x0020\x006F\x0074\x0068\x0065\x0072\x0020\x006D\x0061\x0072\x006B\x0075\x0070\x00"
@@ -325,8 +325,8 @@
226
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x006E\x0061\x006D\x0065\x0020\x0066\x006F\x0072\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x00"
227
L"\x0045\x006E\x0074\x0069\x0074\x0079\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x0075\x006E\x0064\x00"
228
L"\x0055\x006E\x0070\x0061\x0072\x0073\x0065\x0064\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x0073\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x002C\x0020\x006E\x006F\x0074\x0020\x0076\x0061\x006C\x0069\x0064\x0020\x0068\x0065\x0072\x0065\x00"
- 229
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x00"
- 230
L"\x0052\x0065\x0063\x0075\x0072\x0073\x0069\x0076\x0065\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0065\x0078\x0070\x0061\x006E\x0073\x0069\x006F\x006E\x00"
+ 229
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x00"
+ 230
L"\x0052\x0065\x0063\x0075\x0072\x0073\x0069\x0076\x0065\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0065\x0078\x0070\x0061\x006E\x0073\x0069\x006F\x006E\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x00"
231
L"\x0050\x0061\x0072\x0074\x0069\x0061\x006C\x0020\x006D\x0061\x0072\x006B\x0075\x0070\x0020\x0069\x006E\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0076\x0061\x006C\x0075\x0065\x00"
232
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x00"
233
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0069\x0063\x0061\x0074\x0069\x006F\x006E\x0020\x0065\x0078\x0070\x0072\x0065\x0073\x0073\x0069\x006F\x006E\x0020\x0066\x006F\x0072\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x00"
@@ -945,6 +945,7 @@
24599
L"\x0055\x006E\x0072\x0065\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0061\x0062\x006C\x0065\x0020\x0063\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x0020\x0064\x0061\x0074\x0061\x00"
24600
L"\x0055\x006E\x0072\x0065\x0063\x006F\x0067\x006E\x0069\x007A\x0065\x0064\x0020\x004E\x006F\x0064\x0065\x0020\x0054\x0079\x0070\x0065\x00"
END
+
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
1.30 +4 -3
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XercesMessages_en_US.hpp 16 Sep 2004 13:32:05 -0000 1.29
+++ XercesMessages_en_US.hpp 28 Oct 2004 23:01:31 -0000 1.30
@@ -476,7 +476,7 @@
0x00 }
, {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0073,0x0074,0x0061,0x0072,0x0074,0x0020,0x0074,0x0061,0x0067,0x002C,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x00
}
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0061,0x006E,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x00
}
- , {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0065,0x006E,0x0064,0x0020,0x0074,0x0061,0x0067,0x00
}
+ , {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0065,0x006E,0x0064,0x0020,0x0074,0x0061,0x0067,0x002C,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x00
}
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0028,0x0043,0x0044,0x0041,0x0054,0x0041,0x002C,0x0020,0x0049,0x0044,0x002C,0x0020,0x004E,0x004D,0x0054,0x004F,0x004B,0x0045,0x004E,0x002C,0x0020,
0x002E,0x002E,0x0029,0x002C,0x0020,0x0066,0x006F,0x0072,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x006F,0x0066,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,
0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x00 }
@@ -515,8 +515,9 @@
, {
0x0045,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0077,0x0061,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00
}
, {
0x0055,0x006E,0x0070,0x0061,0x0072,0x0073,0x0065,0x0064,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0072,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x0073,0x002C,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x002C,0x0020,
0x006E,0x006F,0x0074,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0068,0x0065,0x0072,0x0065,0x00
}
- , {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0072,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x00
}
- , {
0x0052,0x0065,0x0063,0x0075,0x0072,0x0073,0x0069,0x0076,0x0065,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0065,0x0078,0x0070,0x0061,0x006E,0x0073,0x0069,0x006F,0x006E,0x00
}
+ , {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0072,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x002C,0x0020,0x0027,0x007B,0x0030,0x007D,
+ 0x0027,0x00 }
+ , {
0x0052,0x0065,0x0063,0x0075,0x0072,0x0073,0x0069,0x0076,0x0065,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0065,0x0078,0x0070,0x0061,0x006E,0x0073,0x0069,0x006F,0x006E,0x002C,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x00
}
, {
0x0050,0x0061,0x0072,0x0074,0x0069,0x0061,0x006C,0x0020,0x006D,0x0061,0x0072,0x006B,0x0075,0x0070,0x0020,0x0069,0x006E,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x00
}
, {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x002C,0x0020,0x0027,
0x007B,0x0030,0x007D,0x0027,0x00 }
1.29 +3 -3
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XercesMessages_en_US.Msg 16 Sep 2004 13:32:05 -0000 1.28
+++ XercesMessages_en_US.Msg 28 Oct 2004 23:01:31 -0000 1.29
@@ -194,7 +194,7 @@
197 Unexpected text before root element
198 Unterminated start tag, '{0}'
199 Expected an attribute value
-200 Unterminated end tag
+200 Unterminated end tag, '{0}'
201 Expected type (CDATA, ID, NMTOKEN, ..), for attribute '{0}' of element '{1}'
202 Expected end of tag '{0}'
203 Expected tag name, comment, PI, or other markup
@@ -223,8 +223,8 @@
226 Expected entity name for reference
227 Entity '{0}' was not found
228 Unparsed entity references, '{0}', not valid here
-229 Unterminated entity reference
-230 Recursive entity expansion
+229 Unterminated entity reference, '{0}'
+230 Recursive entity expansion, '{0}'
231 Partial markup in entity value
232 Unterminated element declaration, '{0}'
233 Expected content specification expression for element '{0}'
1.48 +3 -3 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- XMLErrList_EN_US.Xml 16 Sep 2004 13:32:05 -0000 1.47
+++ XMLErrList_EN_US.Xml 28 Oct 2004 23:01:31 -0000 1.48
@@ -206,7 +206,7 @@
<Message Id="UnexpectedTextBeforeRoot" Text="Unexpected text before
root element"/>
<Message Id="UnterminatedStartTag" Text="Unterminated start tag,
'{0}'"/>
<Message Id="ExpectedAttrValue" Text="Expected an attribute value"/>
- <Message Id="UnterminatedEndTag" Text="Unterminated end tag"/>
+ <Message Id="UnterminatedEndTag" Text="Unterminated end tag, '{0}'"/>
<Message Id="ExpectedAttributeType" Text="Expected type (CDATA, ID,
NMTOKEN, ..), for attribute '{0}' of element '{1}'"/>
<Message Id="ExpectedEndOfTagX" Text="Expected end of tag '{0}'"/>
<Message Id="ExpectedMarkup" Text="Expected tag name, comment, PI, or
other markup"/>
@@ -235,8 +235,8 @@
<Message Id="ExpectedEntityRefName" Text="Expected entity name for
reference"/>
<Message Id="EntityNotFound" Text="Entity '{0}' was not found"/>
<Message Id="NoUnparsedEntityRefs" Text="Unparsed entity references,
'{0}', not valid here"/>
- <Message Id="UnterminatedEntityRef" Text="Unterminated entity
reference"/>
- <Message Id="RecursiveEntity" Text="Recursive entity expansion"/>
+ <Message Id="UnterminatedEntityRef" Text="Unterminated entity
reference, '{0}'"/>
+ <Message Id="RecursiveEntity" Text="Recursive entity expansion, '{0}'"/>
<Message Id="PartialMarkupInEntity" Text="Partial markup in entity
value"/>
<Message Id="UnterminatedElementDecl" Text="Unterminated element
declaration, '{0}'"/>
<Message Id="ExpectedContentSpecExpr" Text="Expected content
specification expression for element '{0}'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
