From: Oleg T. <he...@us...> - 2005-10-28 21:39:22
|
Update of /cvsroot/mvp-xml/Common/v2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7777/v2/src Modified Files: Common.csproj SR.cs SR.resx Log Message: Index: SR.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v2/src/SR.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SR.cs 16 Oct 2005 16:51:24 -0000 1.1 +++ SR.cs 28 Oct 2005 21:39:09 -0000 1.2 @@ -16,14 +16,12 @@ /// <summary>Contains resources for the application.</summary> - sealed class SR + internal static class SR { private static ResourceManager _resourceManager = new ResourceManager(typeof(SR).FullName, typeof(SR).Module.Assembly); - private SR() { } - /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> Index: Common.csproj =================================================================== RCS file: /cvsroot/mvp-xml/Common/v2/src/Common.csproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Common.csproj 28 Oct 2005 20:01:47 -0000 1.5 +++ Common.csproj 28 Oct 2005 21:39:09 -0000 1.6 @@ -148,6 +148,7 @@ </EmbeddedResource> <EmbeddedResource Include="SR.resx"> <DependentUpon>SR.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> Index: SR.resx =================================================================== RCS file: /cvsroot/mvp-xml/Common/v2/src/SR.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SR.resx 16 Oct 2005 16:51:24 -0000 1.1 +++ SR.resx 28 Oct 2005 21:39:09 -0000 1.2 @@ -1,68 +1,146 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8"?> <root> - <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> - <xsd:element name="root" msdata:IsDataSet="true"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="data"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="mimetype" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="resheader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:complexType> - </xsd:element> - </xsd:schema> - <resheader name="ResMimeType"> - <value>text/microsoft-resx</value> - </resheader> - <resheader name="Version"> - <value>1.0.0.0</value> - </resheader> - <resheader name="Reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <resheader name="Writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <data name="XmlNodeListFactory_IHasXmlNodeMissing" type="System.String" mimetype="System.String"> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <data name="XmlNodeListFactory_IHasXmlNodeMissing" xml:space="preserve"> <value>The XPath query was not executed against an XmlNode-based object (such as XmlDocument).</value> <comment>The factory received an XPathNodeIterator that was not obtained from querying an XmlDocument or XmlNode.</comment> </data> - <data name="IndexingXPathNavigator_KeyWrongArguments" type="System.String" mimetype="System.String"> + <data name="IndexingXPathNavigator_KeyWrongArguments" xml:space="preserve"> <value>Wrong number of arguments of key() function.</value> <comment>The key() function was called with invalid number of args.</comment> </data> - <data name="IndexingXPathNavigator_KeyArgumentNotString" type="System.String" mimetype="System.String"> + <data name="IndexingXPathNavigator_KeyArgumentNotString" xml:space="preserve"> <value>Type of the first argument of key() function must be string.</value> </data> - <data name="XmlFragmentStream_EOF" type="System.String" mimetype="System.String"> + <data name="XmlFragmentStream_EOF" xml:space="preserve"> <value>Attempt to read past EOF.</value> <comment>The read method was called while the class is already in EOF.</comment> </data> - <data name="XPathCache_BadSortObject" type="System.String" mimetype="System.String"> + <data name="XPathCache_BadSortObject" xml:space="preserve"> <value>Sort expression must be either a string or an XPathExpression.</value> <comment>Sort expression is invalid.</comment> </data> - <data name="XmlDocumentFactory_NotImplementedDOM" type="System.String" mimetype="System.String"> + <data name="XmlDocumentFactory_NotImplementedDOM" xml:space="preserve"> <value>The XmlDocument instance can only be used for serialization purposes.</value> <comment>All methods except for WriteTo() are unimplemented.</comment> </data> - <data name="XPathNavigatorIterator_CantAddAfterMove" type="System.String" mimetype="System.String"> + <data name="XPathNavigatorIterator_CantAddAfterMove" xml:space="preserve"> <value>Can't add new elements after the iterator has moved.</value> <comment>Can't add new elements after the iterator has moved.</comment> </data> |