消除重复项目，重命名name相同，value不同的项目

SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx

@@ -1,94 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
-<root>
+<root xmlns:ns1="urn:schemas-microsoft-com:xml-msdata" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<!-- 
+	
-		Microsoft ResX Schema
 
-		Version 1.3
+	<xs:schema id="root">
-
+		<xs:element name="root" ns1:IsDataSet="true">
-		The primary goals of this format is to allow a simple XML format 
+			<xs:complexType>
-		that is mostly human readable. The generation and parsing of the 
+				<xs:choice maxOccurs="unbounded">
-		various data types are done through the TypeConverter classes 
+					<xs:element name="data">
-		associated with the data types.
+						<xs:complexType>
-
+							<xs:sequence>
-		Example:
+								<xs:element name="value" type="xsd:string" minOccurs="0" ns1:Ordinal="1" />
-
+								<xs:element name="comment" type="xsd:string" minOccurs="0" ns1:Ordinal="2" />
-		... ado.net/XML headers & schema ...
+							</xs:sequence>
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
+							<xs:attribute name="name" type="xsd:string" ns1:Ordinal="1" />
-		<resheader name="version">1.3</resheader>
+							<xs:attribute name="type" type="xsd:string" ns1:Ordinal="3" />
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+							<xs:attribute name="mimetype" type="xsd:string" ns1:Ordinal="4" />
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+						</xs:complexType>
-		<data name="Name1">this is my long string</data>
+					</xs:element>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+					<xs:element name="resheader">
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+						<xs:complexType>
-			[base64 mime encoded serialized .NET Framework object]
+							<xs:sequence>
-		</data>
+								<xs:element name="value" type="xsd:string" minOccurs="0" ns1:Ordinal="1" />
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+							</xs:sequence>
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+							<xs:attribute name="name" type="xsd:string" use="required" />
-		</data>
+						</xs:complexType>
-
+					</xs:element>
-		There are any number of "resheader" rows that contain simple 
+				</xs:choice>
-		name/value pairs.
+			</xs:complexType>
-
+		</xs:element>
-		Each data row contains a name, and value. The row also contains a 
+	</xs:schema>
-		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.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: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" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</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>
@@ -101,7 +41,7 @@
 	<resheader name="writer">
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
-	<!-- login.aspx-->
+	
 	<data name="Title" xml:space="preserve">
 		<value>数字化施工管理信息平台</value>
 	</data>
@@ -123,10 +63,7 @@
 	<data name="RememberMeText" xml:space="preserve">
 		<value>一周内自动登录</value>
 	</data>
-	<!-- indexProject.aspx -->
+	
-	<data name="Title" xml:space="preserve">
-		<value>数字化施工管理信息平台</value>
-	</data>
 	<data name="HomeButtonText" xml:space="preserve">
 		<value>首页</value>
 	</data>
@@ -172,7 +109,7 @@
 	<data name="LogoutButtonText" xml:space="preserve">
 		<value>退出</value>
 	</data>
-	<!-- mainProject.aspx -->
+	
 	<data name="HomePageTitle" xml:space="preserve">
 		<value>首页</value>
 	</data>
@@ -293,6 +230,6 @@
 	<data name="WeatherConditionLabel" xml:space="preserve">
 		<value>天气情况</value>
 	</data>
-	<!-- HJGL-Base-Info -->
+	
-	<!-- Components -->
+	
 </root>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -17478,6 +17478,7 @@
     <Content Include="App_GlobalResources\Lan.resx">
       <Generator>GlobalResourceProxyGenerator</Generator>
       <LastGenOutput>Lan.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
   <ItemGroup>