More logging, Italian, quantities with units in many languages, etc., ver. 2.18.880

Config/Entities/Enums.cs

@@ -84,6 +84,9 @@ namespace Config.Entities
 #if LANG_PL
         [Description("zimna")]  ColdWater,
         [Description("ciepła")] HotWater,
+#elif LANG_IT
+        [Description("freddo")] ColdWater,
+        [Description("caldo")]  HotWater,
 #else
 		[Description("cold")]   ColdWater,
 		[Description("hot")]    HotWater,

TBF/BenchControl/Elde/ControlComWrap.cs

@@ -257,17 +257,12 @@ namespace TBF.BenchControl.Elde
         ///
         private void DoValveMove(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime)
 		{
-            //TBF.UiBridge.Bridge.OnLog(this, string.Format("{0} ValveMove({1}, {2}, [{3}, {4}])\r\n",
-            //                                              DateTime.Now.ToLongTimeString(),
-            //                                              valveNo,
-            //                                              valveMode,
-            //                                              valveValue[0],
-            //                                              valveValue[1]));
-            log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
 #if DN100 || MUNICH || FUZHOU150
+            log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
             ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
 #else /// all newer benches
-			ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
+            log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}], {4})", valveNo, valveMode, valveValue[0], valveValue[1], stableTime);
+            ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
 #endif
 		}
 

TBF/BenchControl/Output/Enums.cs

@@ -1,17 +1,18 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
 ///
 namespace TBF.BenchControl.Output
 {
 	public enum Culture
 	{
 		system,
-		EN,
-		DE,
-		SK,
         CS,
+        DE,
+        EN,
+        IT,
         PL,
         RU,
+        SK,
 		Count
 	}
 }

TBF/BenchControl/Various/ErrorFlags/TestParams.cs

@@ -130,10 +130,10 @@ namespace TBF.BenchControl.Various.ErrorFlags
 			"max. Abs(Tup - Tdn) [°C]",
 			string.Format("min. {0}", Strings.Test_time_s_chdr),
 			string.Format("max. {0}", Strings.Test_time_s_chdr),
-			string.Format("min. {0}", Strings.Ambient_temp_C_),
-			string.Format("max. {0}", Strings.Ambient_temp_C_),
-			string.Format("min. {0}", Strings.Pressure_bar),
-			string.Format("max. {0}", Strings.Pressure_bar),
+			string.Format("min. {0} [°C]", Strings.Air_temperature),
+			string.Format("max. {0} [°C]", Strings.Air_temperature),
+			string.Format("min. {0} [bar]", Strings.Pressure),
+			string.Format("max. {0} [bar]", Strings.Pressure),
 
 			"Coef.E9",
 			"Coef.E10",

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.878.0")]
-[assembly: AssemblyFileVersion("2.18.878.0")]
+[assembly: AssemblyVersion("2.18.880.0")]
+[assembly: AssemblyFileVersion("2.18.880.0")]

TBF/Resources/Strings.Designer.cs

@@ -213,6 +213,33 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Air humidity.
+        /// </summary>
+        internal static string Air_humidity {
+            get {
+                return ResourceManager.GetString("Air_humidity", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Air pressure.
+        /// </summary>
+        internal static string Air_pressure {
+            get {
+                return ResourceManager.GetString("Air_pressure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Air temperature.
+        /// </summary>
+        internal static string Air_temperature {
+            get {
+                return ResourceManager.GetString("Air_temperature", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to All tests must be completed.
         /// </summary>
@@ -222,15 +249,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Air humidity [%]:.
-        /// </summary>
-        internal static string Ambient_humi_pct_ {
-            get {
-                return ResourceManager.GetString("Ambient_humi_pct_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Ambient humidity.
         /// </summary>
@@ -240,15 +258,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Air pressure [mbar]:.
-        /// </summary>
-        internal static string Ambient_press_bar_ {
-            get {
-                return ResourceManager.GetString("Ambient_press_bar_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Ambient pressure.
         /// </summary>
@@ -258,15 +267,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Air temperature [°C]:.
-        /// </summary>
-        internal static string Ambient_temp_C_ {
-            get {
-                return ResourceManager.GetString("Ambient_temp_C_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Ambient temperature.
         /// </summary>
@@ -933,33 +933,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Correction [g].
-        /// </summary>
-        internal static string Correction_g {
-            get {
-                return ResourceManager.GetString("Correction_g", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Correction [l/h].
-        /// </summary>
-        internal static string Correction_lph {
-            get {
-                return ResourceManager.GetString("Correction_lph", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Correction [mbar].
-        /// </summary>
-        internal static string Correction_mbar {
-            get {
-                return ResourceManager.GetString("Correction_mbar", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Counterclockwise.
         /// </summary>
@@ -1689,15 +1662,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Flow [m3/h].
-        /// </summary>
-        internal static string Flow_m3h {
-            get {
-                return ResourceManager.GetString("Flow_m3h", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Flow meter temperature range does not fit this test conditions.
         /// </summary>
@@ -2175,6 +2139,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Mass.
+        /// </summary>
+        internal static string Mass {
+            get {
+                return ResourceManager.GetString("Mass", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mass diff. [kg]:.
         /// </summary>
@@ -2184,24 +2157,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Mass [kg].
-        /// </summary>
-        internal static string Mass_kg {
-            get {
-                return ResourceManager.GetString("Mass_kg", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Mass [kg]:.
-        /// </summary>
-        internal static string Mass_kg_ {
-            get {
-                return ResourceManager.GetString("Mass_kg_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Mass method.
         /// </summary>
@@ -2877,15 +2832,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pressure [bar].
-        /// </summary>
-        internal static string Pressure_bar {
-            get {
-                return ResourceManager.GetString("Pressure_bar", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Pressure Hi [bar].
         /// </summary>
@@ -4209,6 +4155,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        internal static string String1 {
+            get {
+                return ResourceManager.GetString("String1", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Supress WM trills.
         /// </summary>
@@ -4282,7 +4237,7 @@ namespace TBF.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to T div..
+        ///   Looks up a localized string similar to T div.
         /// </summary>
         internal static string T_div {
             get {
@@ -4290,15 +4245,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to T div [°C]:.
-        /// </summary>
-        internal static string T_div_C_ {
-            get {
-                return ResourceManager.GetString("T_div_C_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to T hot cooling.
         /// </summary>
@@ -4326,15 +4272,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to T in [°C]:.
-        /// </summary>
-        internal static string T_in_C_ {
-            get {
-                return ResourceManager.GetString("T_in_C_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to T inlet.
         /// </summary>
@@ -4353,15 +4290,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to T out [°C]:.
-        /// </summary>
-        internal static string T_out_C_ {
-            get {
-                return ResourceManager.GetString("T_out_C_", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to T outlet.
         /// </summary>

TBF/Resources/Strings.cs.resx

@@ -285,15 +285,6 @@
   <data name="Corrected" xml:space="preserve">
     <value>Opraveno</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>Korekce [g]</value>
-  </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>Korekce [l/h]</value>
-  </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>Korekce [mbar]</value>
-  </data>
   <data name="Create_DB" xml:space="preserve">
     <value>Vytvořit DB</value>
   </data>
@@ -435,9 +426,6 @@
   <data name="FinishBtnText" xml:space="preserve">
     <value>Dokončit</value>
   </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>Průtok [m3 / h]</value>
-  </data>
   <data name="Flow_selection" xml:space="preserve">
     <value>Výběr průtoku</value>
   </data>
@@ -507,8 +495,8 @@
   <data name="Make_tank_empty" xml:space="preserve">
     <value>Vyprázdnit nádrž</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>Hmotnost [kg]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>Hmotnost</value>
   </data>
   <data name="Measure_the_mass" xml:space="preserve">
     <value>Změřte hmotnost</value>
@@ -666,9 +654,6 @@
   <data name="PowerPct" xml:space="preserve">
     <value>Výkon [%]</value>
   </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>Tlak [bar]</value>
-  </data>
   <data name="Pressure_hi_bar" xml:space="preserve">
     <value>Tlak max. [bar]</value>
   </data>
@@ -922,7 +907,7 @@
     <value>Spínací body</value>
   </data>
   <data name="T_div" xml:space="preserve">
-    <value>T div.</value>
+    <value>T div</value>
   </data>
   <data name="T_in" xml:space="preserve">
     <value>T in</value>

TBF/Resources/Strings.de.resx

@@ -366,15 +366,6 @@
   <data name="Corrected" xml:space="preserve">
     <value>Korrigiert</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>Korrektur [g]</value>
-  </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>Korrektur [l/h]</value>
-  </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>Korrektur [mbar]</value>
-  </data>
   <data name="DB_was_successfully_created" xml:space="preserve">
     <value>Die Datenbank wurde erfolgreich erstellt.</value>
   </data>
@@ -396,17 +387,14 @@
   <data name="ExitBtnText" xml:space="preserve">
     <value>Beenden</value>
   </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>Durchfluss [m³/h]</value>
-  </data>
   <data name="Invalid_password" xml:space="preserve">
     <value>Ungültiges Passwort</value>
   </data>
   <data name="LockBtnText" xml:space="preserve">
     <value>Abschließen</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>Masse [kg]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>Masse</value>
   </data>
   <data name="Measured" xml:space="preserve">
     <value>Gemessen</value>
@@ -426,9 +414,6 @@
   <data name="Please_change_the_following_settings" xml:space="preserve">
     <value>Bitte ändern Sie die folgenden Einstellungen:</value>
   </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>Druck [bar]</value>
-  </data>
   <data name="Properties" xml:space="preserve">
     <value>Eigenschaften</value>
   </data>
@@ -1020,14 +1005,14 @@
   <data name="Valid_until" xml:space="preserve">
     <value>Gültig bis</value>
   </data>
-  <data name="Ambient_humi_pct_" xml:space="preserve">
-    <value>Luftfeuchtigkeit [%]:</value>
+  <data name="Air_humidity" xml:space="preserve">
+    <value>Luftfeuchtigkeit</value>
   </data>
-  <data name="Ambient_press_bar_" xml:space="preserve">
-    <value>Umgebungsdruck [mbar]:</value>
+  <data name="Air_pressure" xml:space="preserve">
+    <value>Umgebungsdruck</value>
   </data>
-  <data name="Ambient_temp_C_" xml:space="preserve">
-    <value>Umgebungstemperatur [°C]:</value>
+  <data name="Air_temperature" xml:space="preserve">
+    <value>Umgebungstemperatur</value>
   </data>
   <data name="Compound_meter_nr" xml:space="preserve">
     <value>Verbundwasserzähler {0}</value>
@@ -1038,9 +1023,6 @@
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>Masse dif. [kg]:</value>
   </data>
-  <data name="Mass_kg_" xml:space="preserve">
-    <value>Masse [kg]:</value>
-  </data>
   <data name="Meter_nr" xml:space="preserve">
     <value>Wasserzähler {0}</value>
   </data>
@@ -1083,15 +1065,6 @@
   <data name="Target_volume_l_" xml:space="preserve">
     <value>Prüfvolumen [l]:</value>
   </data>
-  <data name="T_div_C_" xml:space="preserve">
-    <value>T div [°C]:</value>
-  </data>
-  <data name="T_in_C_" xml:space="preserve">
-    <value>T ein [°C]:</value>
-  </data>
-  <data name="T_out_C_" xml:space="preserve">
-    <value>T aus [°C]:</value>
-  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>Speichern</value>
   </data>
@@ -1185,9 +1158,6 @@
   <data name="Density" xml:space="preserve">
     <value>Dichte</value>
   </data>
-  <data name="Density_kg_m3" xml:space="preserve">
-    <value>Dichte [kg/m3]</value>
-  </data>
   <data name="End" xml:space="preserve">
     <value>Ende</value>
   </data>

TBF/Resources/Strings.it.resx

@@ -208,7 +208,7 @@
     <value>sensore</value>
   </data>
   <data name="T_div" xml:space="preserve">
-    <value>T div.</value>
+    <value>T div</value>
   </data>
   <data name="T_in" xml:space="preserve">
     <value>T dentro</value>
@@ -249,14 +249,11 @@
   <data name="New_name_copy" xml:space="preserve">
     <value> - Copia</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>correzione [g]</value>
-  </data>
   <data name="Nr" xml:space="preserve">
     <value>numero</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>massa [kg]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>massa</value>
   </data>
   <data name="AddBtnText" xml:space="preserve">
     <value>Aggiunta</value>
@@ -279,17 +276,11 @@
   <data name="OkBtnText" xml:space="preserve">
     <value>ok</value>
   </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>correzione [l/h]</value>
+  <data name="Flow" xml:space="preserve">
+    <value>flusso</value>
   </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>correzione [mbar]</value>
-  </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>flusso [m3/h]</value>
-  </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>pressione [bar]</value>
+  <data name="Pressure" xml:space="preserve">
+    <value>pressione</value>
   </data>
   <data name="Invalid_username_or_password" xml:space="preserve">
     <value>Username o password non validi</value>
@@ -993,9 +984,6 @@
   <data name="AtTemperature_C" xml:space="preserve">
     <value>@temperatura [°C]</value>
   </data>
-  <data name="Density_kg_m3" xml:space="preserve">
-    <value>densità [kg/m3]</value>
-  </data>
   <data name="Density" xml:space="preserve">
     <value>densità</value>
   </data>
@@ -1011,9 +999,6 @@
   <data name="Communication" xml:space="preserve">
     <value>Comunicazione</value>
   </data>
-  <data name="Aux_" xml:space="preserve">
-    <value>aux:</value>
-  </data>
   <data name="Main_" xml:space="preserve">
     <value>principale:</value>
   </data>
@@ -1023,12 +1008,6 @@
   <data name="Qt" xml:space="preserve">
     <value>Qt</value>
   </data>
-  <data name="cold" xml:space="preserve">
-    <value>freddo </value>
-  </data>
-  <data name="hot" xml:space="preserve">
-    <value>caldo</value>
-  </data>
   <data name="Water" xml:space="preserve">
     <value>acqua</value>
   </data>
@@ -1221,14 +1200,14 @@
   <data name="Valid_until" xml:space="preserve">
     <value>valido fino a</value>
   </data>
-  <data name="Ambient_humi_pct_" xml:space="preserve">
-    <value>umidità dell'aria [%]:</value>
+  <data name="Air_humidity" xml:space="preserve">
+    <value>umidità dell'aria</value>
   </data>
-  <data name="Ambient_press_bar_" xml:space="preserve">
-    <value>pressione dell'aria [mbar]:</value>
+  <data name="Air_pressure" xml:space="preserve">
+    <value>pressione dell'aria</value>
   </data>
-  <data name="Ambient_temp_C_" xml:space="preserve">
-    <value>Temperatura dell'aria [°C]:</value>
+  <data name="Air_temperature" xml:space="preserve">
+    <value>Temperatura dell'aria</value>
   </data>
   <data name="Compound_meter_nr" xml:space="preserve">
     <value>misuratore composto {0}</value>
@@ -1242,9 +1221,6 @@
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>mass diff [kg]:</value>
   </data>
-  <data name="Mass_kg_" xml:space="preserve">
-    <value>massa [kg]:</value>
-  </data>
   <data name="Meter_nr" xml:space="preserve">
     <value>metri {0}</value>
   </data>
@@ -1287,15 +1263,6 @@
   <data name="Target_volume_l_" xml:space="preserve">
     <value>target volume [l]:</value>
   </data>
-  <data name="T_div_C_" xml:space="preserve">
-    <value>T div [°C]:</value>
-  </data>
-  <data name="T_in_C_" xml:space="preserve">
-    <value>T dentro [°C]:</value>
-  </data>
-  <data name="T_out_C_" xml:space="preserve">
-    <value>T fuori [°C]:</value>
-  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>salva larghezza colonne</value>
   </data>
@@ -1347,9 +1314,6 @@
   <data name="Print_watermeter_results" xml:space="preserve">
     <value>stampare i risultati dei contatori</value>
   </data>
-  <data name="Again" xml:space="preserve">
-    <value>ancora</value>
-  </data>
   <data name="Sent" xml:space="preserve">
     <value>inviato</value>
   </data>
@@ -1776,4 +1740,10 @@
   <data name="Correction" xml:space="preserve">
     <value>correzione</value>
   </data>
+  <data name="Camera" xml:space="preserve">
+    <value>Fotocamera</value>
+  </data>
+  <data name="Finish_the_session_please" xml:space="preserve">
+    <value>Finire la misurazione perfavore</value>
+  </data>
 </root>

TBF/Resources/Strings.pl.resx

@@ -142,7 +142,7 @@
     <value>Wilgotność otoczenia</value>
   </data>
   <data name="Ambient_pressure" xml:space="preserve">
-    <value>Ciśnienie pracy</value>
+    <value>Ciśnienie otoczenia</value>
   </data>
   <data name="Ambient_temperature" xml:space="preserve">
     <value>Temperatura otoczenia</value>
@@ -258,15 +258,6 @@
   <data name="Corrected" xml:space="preserve">
     <value>Poprawiono</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>Korekta [g]</value>
-  </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>Korekta [l / h]</value>
-  </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>Korekta [mbar]</value>
-  </data>
   <data name="Create_DB" xml:space="preserve">
     <value>Tworzenie bazy danych</value>
   </data>
@@ -288,9 +279,6 @@
   <data name="Density" xml:space="preserve">
     <value>Gęstość</value>
   </data>
-  <data name="Density_kg_m3" xml:space="preserve">
-    <value>Gęstość [kg / m3]</value>
-  </data>
   <data name="DescriptionColHdr" xml:space="preserve">
     <value>Opis</value>
   </data>
@@ -405,8 +393,8 @@
   <data name="FinishBtnText" xml:space="preserve">
     <value>Koniec</value>
   </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>Przepływ [m3 / h]</value>
+  <data name="Flow" xml:space="preserve">
+    <value>Przepływ</value>
   </data>
   <data name="Flow_selection" xml:space="preserve">
     <value>Wybór przepływu</value>
@@ -462,8 +450,8 @@
   <data name="Make_tank_empty" xml:space="preserve">
     <value>Opróżnianie zbiornika</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>Masa [kg]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>Masa</value>
   </data>
   <data name="Measure_the_mass" xml:space="preserve">
     <value>Pomiar masy</value>
@@ -621,8 +609,8 @@
   <data name="PowerPct" xml:space="preserve">
     <value>Moc [%]</value>
   </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>Ciśnienie [bar]</value>
+  <data name="Pressure" xml:space="preserve">
+    <value>Ciśnienie</value>
   </data>
   <data name="Pressure_hi_bar" xml:space="preserve">
     <value>Ciśnienie Hi [bar]</value>
@@ -1236,14 +1224,14 @@
   <data name="Valid_until" xml:space="preserve">
     <value>Ważny do</value>
   </data>
-  <data name="Ambient_humi_pct_" xml:space="preserve">
-    <value>Wilgotność otoczenia [%]:</value>
+  <data name="Air_humidity" xml:space="preserve">
+    <value>Wilgotność otoczenia</value>
   </data>
-  <data name="Ambient_press_bar_" xml:space="preserve">
-    <value>Ciśnienie otoczenia [mBar]:</value>
+  <data name="Air_pressure" xml:space="preserve">
+    <value>Ciśnienie otoczenia</value>
   </data>
-  <data name="Ambient_temp_C_" xml:space="preserve">
-    <value>Temperatura otoczenia [°C]:</value>
+  <data name="Air_temperature" xml:space="preserve">
+    <value>Temperatura otoczenia</value>
   </data>
   <data name="Compound_meter_nr" xml:space="preserve">
     <value>Licznik sprzężony {0}</value>
@@ -1254,9 +1242,6 @@
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>Różnica masy [kg]:</value>
   </data>
-  <data name="Mass_kg_" xml:space="preserve">
-    <value>Masa [kg]</value>
-  </data>
   <data name="Meter_nr" xml:space="preserve">
     <value>Wodomierz {0}</value>
   </data>
@@ -1299,15 +1284,6 @@
   <data name="Target_volume_l_" xml:space="preserve">
     <value>Zadana objętość [l]</value>
   </data>
-  <data name="T_div_C_" xml:space="preserve">
-    <value>T odchylenie [°C]:</value>
-  </data>
-  <data name="T_in_C_" xml:space="preserve">
-    <value>T wejściowa [°C]:</value>
-  </data>
-  <data name="T_out_C_" xml:space="preserve">
-    <value>T wyjściowa [°C]:</value>
-  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>Zachować szerokość kolumn</value>
   </data>
@@ -1318,7 +1294,7 @@
     <value>Dodatkowy</value>
   </data>
   <data name="Main" xml:space="preserve">
-    <value>Główny:</value>
+    <value>Główny</value>
   </data>
   <data name="Closing_the_program" xml:space="preserve">
     <value>Zamknięcie programu</value>

TBF/Resources/Strings.resx

@@ -205,7 +205,7 @@
     <value>Sensor </value>
   </data>
   <data name="T_div" xml:space="preserve">
-    <value>T div.</value>
+    <value>T div</value>
   </data>
   <data name="T_in" xml:space="preserve">
     <value>T in</value>
@@ -246,15 +246,9 @@
   <data name="New_name_copy" xml:space="preserve">
     <value> - Copy</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>Correction [g]</value>
-  </data>
   <data name="Nr" xml:space="preserve">
     <value>Nr.</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>Mass [kg]</value>
-  </data>
   <data name="AddBtnText" xml:space="preserve">
     <value>Add</value>
   </data>
@@ -276,18 +270,6 @@
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>Correction [l/h]</value>
-  </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>Correction [mbar]</value>
-  </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>Flow [m3/h]</value>
-  </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>Pressure [bar]</value>
-  </data>
   <data name="Invalid_username_or_password" xml:space="preserve">
     <value>Invalid username or password</value>
   </data>
@@ -1219,14 +1201,14 @@
   <data name="Valid_until" xml:space="preserve">
     <value>Valid until</value>
   </data>
-  <data name="Ambient_humi_pct_" xml:space="preserve">
-    <value>Air humidity [%]:</value>
+  <data name="Air_humidity" xml:space="preserve">
+    <value>Air humidity</value>
   </data>
-  <data name="Ambient_press_bar_" xml:space="preserve">
-    <value>Air pressure [mbar]:</value>
+  <data name="Air_pressure" xml:space="preserve">
+    <value>Air pressure</value>
   </data>
-  <data name="Ambient_temp_C_" xml:space="preserve">
-    <value>Air temperature [°C]:</value>
+  <data name="Air_temperature" xml:space="preserve">
+    <value>Air temperature</value>
   </data>
   <data name="Compound_meter_nr" xml:space="preserve">
     <value>Compound meter {0}</value>
@@ -1237,8 +1219,8 @@
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>Mass diff. [kg]:</value>
   </data>
-  <data name="Mass_kg_" xml:space="preserve">
-    <value>Mass [kg]:</value>
+  <data name="Mass" xml:space="preserve">
+    <value>Mass</value>
   </data>
   <data name="Meter_nr" xml:space="preserve">
     <value>Meter {0}</value>
@@ -1282,15 +1264,6 @@
   <data name="Target_volume_l_" xml:space="preserve">
     <value>Target volume [l]:</value>
   </data>
-  <data name="T_div_C_" xml:space="preserve">
-    <value>T div [°C]:</value>
-  </data>
-  <data name="T_in_C_" xml:space="preserve">
-    <value>T in [°C]:</value>
-  </data>
-  <data name="T_out_C_" xml:space="preserve">
-    <value>T out [°C]:</value>
-  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>Save column widths</value>
   </data>
@@ -1858,4 +1831,7 @@
   <data name="Pressure" xml:space="preserve">
     <value>Pressure</value>
   </data>
+  <data name="String1" xml:space="preserve">
+    <value />
+  </data>
 </root>

TBF/Resources/Strings.ro.resx

@@ -219,15 +219,6 @@
   <data name="CopyBtnText" xml:space="preserve">
     <value>Copiere</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>Corectii [g]</value>
-  </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>Corrctii [l/h]</value>
-  </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>Corectii [mbar]</value>
-  </data>
   <data name="Create_DB" xml:space="preserve">
     <value>Creare BD</value>
   </data>
@@ -252,9 +243,6 @@
   <data name="Density" xml:space="preserve">
     <value>Densitate</value>
   </data>
-  <data name="Density_kg_m3" xml:space="preserve">
-    <value>Densitate [kg/m3]</value>
-  </data>
   <data name="DescriptionColHdr" xml:space="preserve">
     <value>Descriere</value>
   </data>
@@ -342,8 +330,8 @@
   <data name="FinishBtnText" xml:space="preserve">
     <value>Sfarsit</value>
   </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>Debit [m3/h]</value>
+  <data name="Flow" xml:space="preserve">
+    <value>Debit</value>
   </data>
   <data name="Flow_selection" xml:space="preserve">
     <value>Selectare debit</value>
@@ -399,8 +387,8 @@
   <data name="Make_tank_empty" xml:space="preserve">
     <value>Goliti vasul</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>Masa [kg]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>Masa</value>
   </data>
   <data name="MaxChars" xml:space="preserve">
     <value>(max. _X_  caractere alfanumerice)</value>
@@ -486,8 +474,8 @@
   <data name="PowerPct" xml:space="preserve">
     <value>Putere [%]</value>
   </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>Presiune [bar]</value>
+  <data name="Pressure" xml:space="preserve">
+    <value>Presiune</value>
   </data>
   <data name="Pressure_hi_bar" xml:space="preserve">
     <value>Presiune max [bar]</value>

TBF/Resources/Strings.ru.resx

@@ -202,7 +202,7 @@
     <value>Датчик</value>
   </data>
   <data name="T_div" xml:space="preserve">
-    <value>T разн.</value>
+    <value>T разн</value>
   </data>
   <data name="T_in" xml:space="preserve">
     <value>T вх</value>
@@ -243,14 +243,11 @@
   <data name="New_name_copy" xml:space="preserve">
     <value> - Копировать</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>Коррекция [г]</value>
-  </data>
   <data name="Nr" xml:space="preserve">
     <value>№</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>Масса [кг]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>Масса</value>
   </data>
   <data name="AddBtnText" xml:space="preserve">
     <value>Добавить</value>
@@ -273,17 +270,11 @@
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>Коррекция [л/ч]</value>
+  <data name="Flow" xml:space="preserve">
+    <value>Расход</value>
   </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>Коррекция [мбар]</value>
-  </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>Расход [м3/ч]</value>
-  </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>Давление [бар]</value>
+  <data name="Pressure" xml:space="preserve">
+    <value>Давление</value>
   </data>
   <data name="Username" xml:space="preserve">
     <value>Имя пользователя</value>
@@ -984,9 +975,6 @@
   <data name="AtTemperature_C" xml:space="preserve">
     <value>температура [°C]</value>
   </data>
-  <data name="Density_kg_m3" xml:space="preserve">
-    <value>Плотность [кг/м3]</value>
-  </data>
   <data name="Density" xml:space="preserve">
     <value>Плотность</value>
   </data>
@@ -1203,14 +1191,14 @@
   <data name="Valid_until" xml:space="preserve">
     <value>Годен до</value>
   </data>
-  <data name="Ambient_humi_pct_" xml:space="preserve">
-    <value>Влажность воздуха [%]:</value>
+  <data name="Air_humidity" xml:space="preserve">
+    <value>Влажность воздуха</value>
   </data>
-  <data name="Ambient_press_bar_" xml:space="preserve">
-    <value>Давление воздуха [мбар]:</value>
+  <data name="Air_pressure" xml:space="preserve">
+    <value>Давление воздуха</value>
   </data>
-  <data name="Ambient_temp_C_" xml:space="preserve">
-    <value>Температура воздуха [°C]:</value>
+  <data name="Air_temperature" xml:space="preserve">
+    <value>Температура воздуха</value>
   </data>
   <data name="Compound_meter_nr" xml:space="preserve">
     <value>Комбинированный счетчик {0}</value>
@@ -1221,9 +1209,6 @@
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>Mass diff. [kg]:</value>
   </data>
-  <data name="Mass_kg_" xml:space="preserve">
-    <value>Масса [кг]:</value>
-  </data>
   <data name="Meter_nr" xml:space="preserve">
     <value>Счетчик {0}</value>
   </data>
@@ -1266,15 +1251,6 @@
   <data name="Target_volume_l_" xml:space="preserve">
     <value>Заданный объем [л]:</value>
   </data>
-  <data name="T_div_C_" xml:space="preserve">
-    <value>T откл [°C]:</value>
-  </data>
-  <data name="T_in_C_" xml:space="preserve">
-    <value>T вх [°C]:</value>
-  </data>
-  <data name="T_out_C_" xml:space="preserve">
-    <value>T вых [°C]:</value>
-  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>Сохранить ширину столбцов</value>
   </data>

TBF/Resources/Strings.zh-CN.resx

@@ -285,15 +285,6 @@
   <data name="Corrected" xml:space="preserve">
     <value>更正</value>
   </data>
-  <data name="Correction_g" xml:space="preserve">
-    <value>更正[g]</value>
-  </data>
-  <data name="Correction_lph" xml:space="preserve">
-    <value>更正[l/h]</value>
-  </data>
-  <data name="Correction_mbar" xml:space="preserve">
-    <value>更正[mbar]</value>
-  </data>
   <data name="Create_DB" xml:space="preserve">
     <value>创建数据库</value>
   </data>
@@ -318,9 +309,6 @@
   <data name="Density" xml:space="preserve">
     <value>密度</value>
   </data>
-  <data name="Density_kg_m3" xml:space="preserve">
-    <value>密度[kg/m3]</value>
-  </data>
   <data name="DescriptionColHdr" xml:space="preserve">
     <value>描述</value>
   </data>
@@ -438,8 +426,8 @@
   <data name="FinishBtnText" xml:space="preserve">
     <value>完成 Finish</value>
   </data>
-  <data name="Flow_m3h" xml:space="preserve">
-    <value>流量[m3/h]</value>
+  <data name="Flow" xml:space="preserve">
+    <value>流量</value>
   </data>
   <data name="Flow_selection" xml:space="preserve">
     <value>流量选择</value>
@@ -510,8 +498,8 @@
   <data name="Make_tank_empty" xml:space="preserve">
     <value>排空水箱</value>
   </data>
-  <data name="Mass_kg" xml:space="preserve">
-    <value>质量[kg]</value>
+  <data name="Mass" xml:space="preserve">
+    <value>质量</value>
   </data>
   <data name="Measure_the_mass" xml:space="preserve">
     <value>测量质量</value>
@@ -669,8 +657,8 @@
   <data name="PowerPct" xml:space="preserve">
     <value>功率[％]</value>
   </data>
-  <data name="Pressure_bar" xml:space="preserve">
-    <value>压力[bar]</value>
+  <data name="Pressure" xml:space="preserve">
+    <value>压力</value>
   </data>
   <data name="Pressure_hi_bar" xml:space="preserve">
     <value>压力高值[bar]</value>

TBF/Screens/ProcessTabPageCtrl6.cs

@@ -127,9 +127,9 @@ namespace TBF.Screens
 
         void Localize()
         {
-            airTempCapLabel.Text = Strings.Ambient_temp_C_;
-            airPressCapLabel.Text = Strings.Ambient_press_bar_;
-            airHumiCapLabel.Text = Strings.Ambient_humi_pct_;
+            airTempCapLabel.Text = string.Format("{0} [°C]:", Strings.Air_temperature);
+            airPressCapLabel.Text = string.Format("{0} [mbar]:", Strings.Air_pressure);
+            airHumiCapLabel.Text = string.Format("{0} [%]:", Strings.Air_humidity);
 
             targetFlowLowCapLabel.Text = Strings.Target_flow_lo_m3h_;
             targetFlowHighCapLabel.Text = Strings.Target_flow_hi_m3h_;
@@ -139,9 +139,9 @@ namespace TBF.Screens
 
             prUpCapLabel.Text = string.Format("{0} [bar]:", Strings.Pr_up);
             prDownCapLabel.Text = string.Format("{0} [bar]:", Strings.Pr_down);
-            tInCapLabel.Text = Strings.T_in_C_;
-            tOutCapLabel.Text = Strings.T_out_C_;
-            tDivCapLabel.Text = Strings.T_div_C_;
+            tInCapLabel.Text = string.Format("{0} [°C]:", Strings.T_in);
+            tOutCapLabel.Text = string.Format("{0} [°C]:", Strings.T_out);
+            tDivCapLabel.Text = string.Format("{0} [°C]:", Strings.T_div);
 
             regValvePosCapLabel.Text = Strings.Reg_valve_pos_;
             refPulsesCapLabel.Text = Strings.Ref_pulses_;
@@ -149,9 +149,9 @@ namespace TBF.Screens
             refFlowCapLabel.Text = Strings.Ref_flow_m3h_;
             refVolumeCapLabel.Text = Strings.Ref_volume_l_;
 
-            massCapLabel.Text = Strings.Mass_kg_;
+            massCapLabel.Text = string.Format("{0} [kg]:", Strings.Mass);
             massDiffCapLabel.Text = Strings.Mass_diff_kg_;
-            volumeCtvCapLabel.Text = Strings.Volume + " [l]:";
+            volumeCtvCapLabel.Text = string.Format("{0} [l]:", Strings.Volume);
             refErrorCapLabel.Text = Strings.Ref_error_pct_;
 
             GroupBox[] groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6 };
@@ -452,16 +452,16 @@ namespace TBF.Screens
 			///
 			/// Always available
 			///
-			airTempLabel.Text = ProcessData.AmbTemp.ToString();
+			airTempLabel.Text = Config.Units.ConvertTo(Config.Unit.C, ProcessData.AmbTemp.Val).ToString("F1");
             airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbPress.Val).ToString("F0");
-            airHumiLabel.Text = ProcessData.AmbHumi.ToString();
+            airHumiLabel.Text = Config.Units.ConvertTo(Config.Unit.RPct, ProcessData.AmbHumi.Val).ToString("F1");
 
 			tInLabel.Text = ProcessData.TempUp.ToString();
 			tOutLabel.Text = ProcessData.TempDown.ToString();
 			tDivLabel.Text = ProcessData.TempDiv.ToString();
 
-			prUpLabel.Text = ProcessData.PressUp.ToString();
-			prDownLabel.Text = ProcessData.PressDown.ToString();
+			prUpLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressUp.Val).ToString();
+			prDownLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressDown.Val).ToString();
 
 			massLabel.Text = ProcessData.Mass.ToString();
 

TBF/Strings.Designer.cs

@@ -672,15 +672,6 @@ namespace Config.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Density [kg/m3].
-        /// </summary>
-        internal static string Density_kg_m3 {
-            get {
-                return ResourceManager.GetString("Density_kg_m3", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Description.
         /// </summary>

TBF/UiControls/MetrologyDlgBalanceTab.cs

@@ -77,8 +77,8 @@ namespace TBF.UiControls
 			listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
 
 			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
-			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Mass_kg, Width = 100 });
-			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Correction_g, Width = 100 });
+			listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [kg]", Strings.Mass), Width = 100 });
+			listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [g]", Strings.Correction), Width = 100 });
 
 			RefreshAll();
 		}
@@ -92,9 +92,9 @@ namespace TBF.UiControls
             calibDateLabel.Text = Strings.Date;
             calibValidDateLabel.Text = Strings.Valid_until;
 
-			buoyancyTempLabel.Text = Strings.Ambient_temperature + " [°C]";
-            buoyancyPressLabel.Text = Strings.Ambient_pressure + " [mbar]";
-            buoyancyHumiLabel.Text = Strings.Ambient_humidity + " [%]";
+			buoyancyTempLabel.Text = string.Format("{0} [°C]", Strings.Ambient_temperature);
+            buoyancyPressLabel.Text = string.Format("{0} [mbar]", Strings.Ambient_pressure);
+            buoyancyHumiLabel.Text = string.Format("{0} [%]", Strings.Ambient_humidity);
             airDensityLabel.Text = Strings.Air_density_kg_m3;
             weightStandardDensityLabel.Text = Strings.Ref_mass_dens_kg_m3;
 

TBF/UiControls/MetrologyDlgFlowMeterTab.cs

@@ -94,8 +94,8 @@ namespace TBF.UiControls
 			listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
 
 			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
-			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Flow_m3h, Width = 100 });
-			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Correction_lph, Width = 100 });
+			listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [m3/h]", Strings.Flow), Width = 100 });
+			listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [l/h]", Strings.Correction), Width = 100 });
 
             RefreshAll(rangeIx);
 		}

TBF/UiControls/MetrologyDlgPressMeterTab.cs

@@ -74,8 +74,8 @@ namespace TBF.UiControls
 			listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing);
 
 			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 });
-			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Pressure_bar, Width = 100 });
-			listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Correction_mbar, Width = 100 });
+			listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [bar]", Strings.Pressure), Width = 100 });
+			listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [mbar]", Strings.Correction), Width = 100 });
 
 			RefreshAll();
 		}