diff --git a/TBF/LocalSettings.cs b/TBF/LocalSettings.cs index c682b448d..0958220ce 100644 --- a/TBF/LocalSettings.cs +++ b/TBF/LocalSettings.cs @@ -124,7 +124,7 @@ namespace TBF [XmlArrayAttribute("MetersColumnWidths")] public int[] MetersColumnWidths; [XmlIgnore] - public int MetersColumnCount { get { return (MetersColumnWidths != null) ? MetersColumnWidths.Length : 0; } } + public int MetersColumnCount { get { return (ProcMetersColWidths != null) ? ProcMetersColWidths.Length : 0; } } [XmlArrayAttribute("HeatMetersColumnWidths")] public int[] HeatMetersColumnWidths; @@ -174,10 +174,14 @@ namespace TBF /// Process public int ProcessSplitDist1; public int ProcessSplitDist2; - [XmlArrayAttribute("ProcessColumnWidths")] - public int[] ProcessColumnWidths; + [XmlArrayAttribute("MetersColWidths")] + public int[] ProcMetersColWidths; [XmlIgnore] - public int ProcessColumnCount { get { return (ProcessColumnWidths != null) ? ProcessColumnWidths.Length : 0; } } + public int ProcMetersColCount { get { return (ProcMetersColWidths != null) ? ProcMetersColWidths.Length : 0; } } + [XmlArrayAttribute("TestDataColWidths")] + public int[] ProcTestDataColWidths; + [XmlIgnore] + public int ProcTestDataColCount { get { return (ProcTestDataColWidths != null) ? ProcTestDataColWidths.Length : 0; } } /// Procedures public bool ProceduresDlgMaximized; diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index 416fc4525..0e044fde3 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -1770,6 +1770,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to End mass. + /// + internal static string End_mass { + get { + return ResourceManager.GetString("End_mass", resourceCulture); + } + } + /// /// Looks up a localized string similar to End session. /// @@ -4497,6 +4506,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Ref. flowmeter error. + /// + internal static string Ref_flowmeter_error { + get { + return ResourceManager.GetString("Ref_flowmeter_error", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ref. freq. [Hz]:. /// @@ -4723,11 +4741,11 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to repetition. + /// Looks up a localized string similar to Repetition. /// - internal static string repetition { + internal static string Repetition { get { - return ResourceManager.GetString("repetition", resourceCulture); + return ResourceManager.GetString("Repetition", resourceCulture); } } @@ -5415,6 +5433,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Start mass. + /// + internal static string Start_mass { + get { + return ResourceManager.GetString("Start_mass", resourceCulture); + } + } + /// /// Looks up a localized string similar to Start the pump. /// @@ -5803,11 +5830,11 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Target volume [l]:. + /// Looks up a localized string similar to Target volume. /// - internal static string Target_volume_l_ { + internal static string Target_volume { get { - return ResourceManager.GetString("Target_volume_l_", resourceCulture); + return ResourceManager.GetString("Target_volume", resourceCulture); } } @@ -6082,11 +6109,11 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Test time [s]. + /// Looks up a localized string similar to Test time. /// - internal static string Test_time_s_chdr { + internal static string Test_time { get { - return ResourceManager.GetString("Test_time_s_chdr", resourceCulture); + return ResourceManager.GetString("Test_time", resourceCulture); } } @@ -6408,6 +6435,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Unit. + /// + internal static string Unit { + get { + return ResourceManager.GetString("Unit", resourceCulture); + } + } + /// /// Looks up a localized string similar to Unlock. /// diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx index 3bdf5fad2..b49851f4d 100644 --- a/TBF/Resources/Strings.cs.resx +++ b/TBF/Resources/Strings.cs.resx @@ -969,8 +969,8 @@ Zkouška zastavení ({0}: Krok {1} / {2}) - - Zkušební doba [s] + + Zkušební doba Tester @@ -1713,4 +1713,19 @@ Zpoždění + + Jednotky + + + Cílový objem + + + Konečná hmotnost + + + Chyba referenčního průtokoměru + + + Počáteční hmotnost + \ No newline at end of file diff --git a/TBF/Resources/Strings.de.resx b/TBF/Resources/Strings.de.resx index 5613b1e76..11756dbf2 100644 --- a/TBF/Resources/Strings.de.resx +++ b/TBF/Resources/Strings.de.resx @@ -336,8 +336,8 @@ Nullstellen (Ergebnisse) - - Dauer [s] + + Dauer Metr.Daten diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index e8eb03299..bcf19c997 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -396,8 +396,8 @@ Toler. red. [%] - - Test time [s] + + Test time Error while creating the database. Reason: @@ -1255,8 +1255,8 @@ Target ref. count: - - Target volume [l]: + + Target volume Save column widths @@ -1915,8 +1915,8 @@ Import - - repetition + + Repetition Result @@ -2371,4 +2371,16 @@ Delay + + Unit + + + End mass + + + Ref. flowmeter error + + + Start mass + \ No newline at end of file diff --git a/TBF/Rig/Various/ErrorFlags/TestParams.cs b/TBF/Rig/Various/ErrorFlags/TestParams.cs index d613b1814..704d93d49 100644 --- a/TBF/Rig/Various/ErrorFlags/TestParams.cs +++ b/TBF/Rig/Various/ErrorFlags/TestParams.cs @@ -151,8 +151,8 @@ namespace TBF.Rig.Various.ErrorFlags "Delta Q [%]", "Delta T [°C]", "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} [s]", Strings.Test_time), + string.Format("max. {0} [s]", Strings.Test_time), string.Format("min. {0} [°C]", Strings.Air_temperature), string.Format("max. {0} [°C]", Strings.Air_temperature), string.Format("min. {0} [bar]", Strings.Pressure), diff --git a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs index 7bba9c675..206cc7326 100644 --- a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs +++ b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs @@ -671,8 +671,8 @@ namespace TBF.UI.Bench.TestProfiles "Delta Q [%]", "Delta T [°C]", "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} [s]", Strings.Test_time), + string.Format("max. {0} [s]", Strings.Test_time), string.Format("min. {0} [°C]", Strings.Air_temperature), string.Format("max. {0} [°C]", Strings.Air_temperature), "Coef.E9", diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index 0a4badb0e..988a07650 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -810,7 +810,7 @@ namespace TBF.UI.Procedures lv.Columns.Add(new ColumnHeader { Text = "Unit", Width = 50 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Volume, Width = 70 }); lv.Columns.Add(new ColumnHeader { Text = "Unit", Width = 50 }); - lv.Columns.Add(new ColumnHeader { Text = Strings.Test_time_s_chdr, Width = 70 }); + lv.Columns.Add(new ColumnHeader { Text = string.Format("{0} [s]", Strings.Test_time), Width = 70 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_neg_pct_chdr, Width = 80 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 80 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 90 }); diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs index 6f60a5dea..e42452c9a 100644 --- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs +++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs @@ -63,7 +63,7 @@ namespace TBF.UI.Procedures.TestWizard listViewEx.Columns.Add("QBezeichnung", 85); listViewEx.Columns.Add(string.Format("{0} [m3/h]", Strings.Q_from), 80); listViewEx.Columns.Add(string.Format("{0} [m3/h]", Strings.Q_to), 70); - listViewEx.Columns.Add(Strings.Test_time_s_chdr, 70); + listViewEx.Columns.Add(string.Format("{0} [s]", Strings.Test_time), 70); listViewEx.Columns.Add(string.Format("{0} [l]", Strings.Volume, 60)); listViewEx.Columns.Add(Strings.Err_limit_neg_pct_chdr, 80); listViewEx.Columns.Add(Strings.Err_limit_pos_pct_chdr, 80); diff --git a/TBF/UI/Process/ProcessTabPageCtrl6.cs b/TBF/UI/Process/ProcessTabPageCtrl6.cs index 98fda1e98..55c398a69 100644 --- a/TBF/UI/Process/ProcessTabPageCtrl6.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl6.cs @@ -123,7 +123,7 @@ namespace TBF.UI.Process targetFlowLowCapLabel.Text = Strings.Target_flow_lo_m3h_; targetFlowHighCapLabel.Text = Strings.Target_flow_hi_m3h_; - targetVolumeCapLabel.Text = Strings.Target_volume_l_; + targetVolumeCapLabel.Text = Strings.Target_volume; targetRefCountCapLabel.Text = Strings.Target_ref_pulses_; estmtdTimeCapLabel.Text = Strings.Estimated_time_s_;