Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

Properties/Resources.Designer.cs

@@ -177,6 +177,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ClothWheel 的本地化字符串。
+        /// </summary>
+        public static string ClothWheel {
+            get {
+                return ResourceManager.GetString("ClothWheel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Code 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -459,4 +459,7 @@
   <data name="Low-waterlevel" xml:space="preserve">
     <value>Low-water level</value>
   </data>
+  <data name="ClothWheel" xml:space="preserve">
+    <value>Cloth Wheel</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -459,4 +459,7 @@
   <data name="Low-waterlevel" xml:space="preserve">
     <value>Low-water level</value>
   </data>
+  <data name="ClothWheel" xml:space="preserve">
+    <value>ClothWheel</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -459,4 +459,7 @@
   <data name="Low-waterlevel" xml:space="preserve">
     <value>低水位</value>
   </data>
+  <data name="ClothWheel" xml:space="preserve">
+    <value>布轮</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -447,4 +447,19 @@
   <data name="MasterCylinder" xml:space="preserve">
     <value>主缸</value>
   </data>
+  <data name="ProportionalValves" xml:space="preserve">
+    <value>比例控制</value>
+  </data>
+  <data name="Mid-waterlevel" xml:space="preserve">
+    <value>中水位</value>
+  </data>
+  <data name="High-waterlevel" xml:space="preserve">
+    <value>高水位</value>
+  </data>
+  <data name="Low-waterlevel" xml:space="preserve">
+    <value>低水位</value>
+  </data>
+  <data name="ClothWheel" xml:space="preserve">
+    <value>布輪</value>
+  </data>
 </root>

ViewModel/MainWindowViewModel.cs

@@ -930,12 +930,15 @@ namespace DyeingComputer.ViewModel
             }
             if (Pump_M) //主泵状态
             {
-                Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStart+"]";//主泵状态
+                Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStart+"]";//主泵状态
             }
             else
             {
-                Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030"))) + "% => [" + Resources.PumpStops+"]";//主泵状态
+                Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStops+"]";//主泵状态
             }
+            Sys_log = Sys_log + "\n-------------------------------------------------------";
+            Sys_log = Sys_log + "\n" + Resources.ClothWheel;
+
         }
 
         public static DataTable dt_d = new DataTable("DIO");