Explorar o código

Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into

gsp %!s(int64=3) %!d(string=hai) anos
pai
achega
e4df7c4cea

+ 1 - 1
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -964,7 +964,7 @@
 	  <Control name="label42" text="Refining" />
 	  <Control name="label19" text="UserLib" />
 	  <Control name="label18" text="SysLib" />
-	  <Control name="label40" text="ParticleLib" />
+	  <Control name="label40" text="чs" />
 	  <Control name="label16" text="Measurement" />
 	  <Control name="label15" text="Switch" />
 	  <Control name="label14" text="Name" />

+ 1 - 1
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -961,7 +961,7 @@
 	  <Control name="label42" text="精炼工艺" />
 	  <Control name="label19" text="用户分析库编辑" />
 	  <Control name="label18" text="系统分析库文件夹" />
-	  <Control name="label40" text="选择颗粒分析库" />
+	  <Control name="label40" text="чs" />
 	  <Control name="label16" text="测量参数文件夹" />
 	  <Control name="label15" text="执行开关" />
 	  <Control name="label14" text="样品名" />