diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index 44835473e..f9f482c55 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -82,8 +82,8 @@ namespace Config.Entities { [Description("")] NotSpecified, #if LANG_PL - [Description("Zimna")] ColdWater, - [Description("Gorąca")] HotWater, + [Description("zimna")] ColdWater, + [Description("ciepła")] HotWater, #else [Description("cold")] ColdWater, [Description("hot")] HotWater, diff --git a/ResultsBrowser/Resources/Strings.pl.resx b/ResultsBrowser/Resources/Strings.pl.resx index 29a09fadd..75fcfafa6 100644 --- a/ResultsBrowser/Resources/Strings.pl.resx +++ b/ResultsBrowser/Resources/Strings.pl.resx @@ -637,7 +637,7 @@ zimna - gorąca + ciepła Nazwa produktu diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index b6c0c127e..1303efb35 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -207,12 +207,17 @@ - + + Designer + ResXFileCodeGenerator Strings1.Designer.cs + Designer + + + Designer - ResultsBrowserWnd.cs diff --git a/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs b/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs index 608e5b7c0..3647f6b09 100644 --- a/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs +++ b/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs @@ -149,7 +149,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter case 21: return Text4; case 22: return Text5; - case 23: return (WaterTemp == Medium.HotWater) ? Strings.hot : Strings.cold; /// "tepla" : "zimna"; + case 23: return (WaterTemp == Medium.HotWater) ? Medium.HotWater.ToDescription() : Medium.ColdWater.ToDescription(); /// "tepla" : "zimna"; default: return string.Empty; } } @@ -207,7 +207,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter case 21: Text4 = strValue; return; case 22: Text5 = strValue; return; - case 23: WaterTemp = strValue.Equals(Strings.hot) ? Medium.HotWater : Medium.ColdWater; return; /// "tepla" + case 23: WaterTemp = strValue.Equals(Medium.HotWater.ToDescription()) ? Medium.HotWater : Medium.ColdWater; return; /// "tepla" default: return; } } @@ -258,7 +258,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter for (FlowProfileSensitivityClass tc = 0; tc < FlowProfileSensitivityClass.Count; tc++) if (tc.ToDescription().Equals(strValue)) return true; break; case 23: - if (strValue.Equals(Strings.cold) || strValue.Equals(Strings.hot)) return true; /// "zimna", "tepla" + if (strValue.Equals(Medium.ColdWater.ToDescription()) || strValue.Equals(Medium.HotWater.ToDescription())) return true; /// "zimna", "tepla" break; default: message = "Invalid index"; diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index 78e8d5065..d956edbb6 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -771,15 +771,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to cold. - /// - internal static string cold { - get { - return ResourceManager.GetString("cold", resourceCulture); - } - } - /// /// Looks up a localized string similar to Communication. /// @@ -1896,15 +1887,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to hot. - /// - internal static string hot { - get { - return ResourceManager.GetString("hot", resourceCulture); - } - } - /// /// Looks up a localized string similar to ID. /// diff --git a/TBF/Resources/Strings.pl.resx b/TBF/Resources/Strings.pl.resx index 35d04d25a..b3493adbd 100644 --- a/TBF/Resources/Strings.pl.resx +++ b/TBF/Resources/Strings.pl.resx @@ -1053,12 +1053,6 @@ Qt - - Zimna - - - Gorąca - Woda diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 8a4b72b80..bfd3acbac 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -1027,12 +1027,6 @@ Qt [m3/h] - - cold - - - hot - Water