diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index 83a7dcadc..2c8e48cfb 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -56,8 +56,12 @@ namespace Config.Entities [Description("Vodoměry")] Single, [Description("Kombinované vodoměry")] Combined, [Description("Měřiče tepla")] HeatMeter, +#elif LANG_RU + [Description("Счетчик")] Single, + [Description("Комбинированный счетчик")] Combined, + [Description("Счетчик тепла")] HeatMeter, #else - [Description("Water meters")] Single, + [Description("Water meters")] Single, [Description("Compound water meters")] Combined, [Description("Heat meters")] HeatMeter, #endif @@ -84,14 +88,13 @@ namespace Config.Entities public enum Mounting { + [Description("")] NotSpecified, #if LANG_DE - [Description("")] NotSpecified, - [Description("H")] H, /// horizontal - [Description("V")] V, /// vertical - [Description("STR")] S, /// standrohre - [Description("F")] F, /// fall + [Description("H")] H, /// horizontal + [Description("V")] V, /// vertical + [Description("STR")] S, /// standrohre + [Description("F")] F, /// fall #else - [Description("")] NotSpecified, [Description("H")] H, /// horizontal [Description("V")] V, /// vertical [Description("S")] S, /// steig @@ -387,15 +390,19 @@ namespace Config.Entities [Description("info")] Info, [Description("ein")] On, #elif LANG_CS - [Description("vypnuto")] off, + [Description("vypnuto")] Off, [Description("info")] Info, [Description("zapnuto")] On, +#elif LANG_RU + [Description("выключен")] Off, + [Description("информация")] Info, + [Description("включенный")] On, #elif LANG_PL [Description("nie")] Off, [Description("info")] Info, [Description("tak")] On, #else // LANG_EN - [Description("off")] Off, + [Description("off")] Off, [Description("info")] Info, [Description("on")] On, #endif diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 9d98801b4..ef5c9f1ff 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.17.674.0")] -[assembly: AssemblyFileVersion("2.17.674.0")] +[assembly: AssemblyVersion("2.17.686.0")] +[assembly: AssemblyFileVersion("2.17.686.0")] diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs index 985492a7c..58f2f619d 100644 --- a/Results/Entities/MeterTestRslt.cs +++ b/Results/Entities/MeterTestRslt.cs @@ -77,6 +77,9 @@ namespace Results.Entities #if PUCHONG_PT200 if (!Evaluate()) return Passed ? "OK|White" : "NG|White"; else return Passed ? "OK|Green" : "NG|Red"; +#elif LANG_RU + if (!Evaluate()) return Passed ? "годный|White" : "негодный|White"; + else return Passed ? "годный|Green" : "негодный|Red"; #else if (!Evaluate()) return Passed ? "OK|White" : "NOK|White"; else return Passed ? "OK|Green" : "NOK|Red"; diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 9431a9e71..8a0fa6ec9 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.17.681.0")] -[assembly: AssemblyFileVersion("2.17.681.0")] +[assembly: AssemblyVersion("2.17.686.0")] +[assembly: AssemblyFileVersion("2.17.686.0")] diff --git a/Results/Resources/Strings.ru.resx b/Results/Resources/Strings.ru.resx index f4e507704..bca82ea7a 100644 --- a/Results/Resources/Strings.ru.resx +++ b/Results/Resources/Strings.ru.resx @@ -429,4 +429,10 @@ Объем + + Нет + + + Да + \ No newline at end of file diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 0de574cdc..4e751cdd2 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.17.685.1")] -[assembly: AssemblyFileVersion("2.17.685.1")] +[assembly: AssemblyVersion("2.17.686.1")] +[assembly: AssemblyFileVersion("2.17.686.1")]