Merge remote-tracking branch 'private-origin/develop/SLM-PT50_genesisDirectDecode' into develop/SLM-PT50_genesisDirectDecode

TBF/Resources/Strings.fr.resx

@@ -1020,7 +1020,7 @@
   <data name="Simultaneous_with_previous_step" xml:space="preserve">
     <value>Simultanée étape précédente</value>
   </data>
-  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+  <data name="Meter_Communication_in_progress" xml:space="preserve">
     <value>iPerl Communication en cours</value>
   </data>
   <data name="Language" xml:space="preserve">

TBF/Resources/Strings.zh-CN.Designer.cs

@@ -1202,15 +1202,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 正在进行Iperl通信.
-        /// </summary>
-        internal static string iPerl_Communication_in_progress {
-            get {
-                return ResourceManager.GetString("iPerl_Communication_in_progress", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to 语言.
         /// </summary>
@@ -1373,6 +1364,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 正在进行Iperl通信.
+        /// </summary>
+        internal static string Meter_Communication_in_progress {
+            get {
+                return ResourceManager.GetString("Meter_Communication_in_progress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 测试仪表型号.
         /// </summary>
@@ -2057,6 +2057,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        internal static string PulsesPerKilogram {
+            get {
+                return ResourceManager.GetString("PulsesPerKilogram", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 每升脉冲.
         /// </summary>
@@ -2066,6 +2075,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        internal static string PulsesPerUnit {
+            get {
+                return ResourceManager.GetString("PulsesPerUnit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 水泵.
         /// </summary>
@@ -2492,9 +2510,9 @@ namespace TBF.Resources {
         /// <summary>
         ///   Looks up a localized string similar to 序列号.
         /// </summary>
-        internal static string Serial_Number {
+        internal static string Serial_number {
             get {
-                return ResourceManager.GetString("Serial_Number", resourceCulture);
+                return ResourceManager.GetString("Serial_number", resourceCulture);
             }
         }
         
@@ -3074,6 +3092,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        internal static string Units {
+            get {
+                return ResourceManager.GetString("Units", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 解锁 Unlock.
         /// </summary>

TBF/Resources/Strings.zh-CN.resx

@@ -1005,7 +1005,7 @@
   <data name="Simultaneous_with_previous_step" xml:space="preserve">
     <value>同时进行之前步骤</value>
   </data>
-  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+  <data name="Meter_Communication_in_progress" xml:space="preserve">
     <value>正在进行Iperl通信</value>
   </data>
   <data name="Language" xml:space="preserve">

TBF/Rig/TestMethods/GenesisCommunication/GenesisCommunicationSeq.cs

@@ -376,7 +376,7 @@ namespace TBF.Rig.TestMethods.GenesisCommunication
                 Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, method, test, testParams });
 
                 //------------------------------------------------
-                Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress);
+                Bridge.OnActivity(this, Strings.Meter_Communication_in_progress);
                 //------------------------------------------------
 
                 bool stopPressed = false;       /// true when STOP button pressed

TBF/Rig/TestMethods/S640Communication/S640CommSeq.cs

@@ -59,7 +59,7 @@ namespace TBF.Rig.TestMethods.S640Communication
             Program.MainWnd.Invoke(new S640CommFormDlgt(OpenS640CommForm), new object[] { this, activity, config, procParams, test });
 
 			//------------------------------------------------
-			Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress);
+			Bridge.OnActivity(this, Strings.Meter_Communication_in_progress);
 			//------------------------------------------------
 
 			bool stopPressed = false;       /// true when STOP button pressed

TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs

@@ -376,7 +376,7 @@ namespace TBF.Rig.TestMethods.SmartMeterFlyingStartMassCollection
                 Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, method, test, testParams });
 
                 //------------------------------------------------
-                Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress);
+                Bridge.OnActivity(this, Strings.Meter_Communication_in_progress);
                 //------------------------------------------------
 
                 bool stopPressed = false;       /// true when STOP button pressed

TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs

@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
                 Program.MainWnd.Invoke(new iPerlCommFormDlgt(OpenIPerlCommForm), new object[] { this, method, test, testParams });
 
                 //------------------------------------------------
-                Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress);
+                Bridge.OnActivity(this, Strings.Meter_Communication_in_progress);
                 //------------------------------------------------
 
                 bool stopPressed = false;       /// true when STOP button pressed

TBF/Strings.Designer.cs

@@ -1152,9 +1152,9 @@ namespace Config.Resources {
         /// <summary>
         ///   Looks up a localized string similar to iPerl Communication in progress.
         /// </summary>
-        internal static string iPerl_Communication_in_progress {
+        internal static string Meter_Communication_in_progress {
             get {
-                return ResourceManager.GetString("iPerl_Communication_in_progress", resourceCulture);
+                return ResourceManager.GetString("Meter_Communication_in_progress", resourceCulture);
             }
         }