michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes in Russion language, ver. 2.17.686

Browse Source
This commit is contained in:
Milan Hanajik
2017-10-04 10:35:00 +02:00
parent 8974d93877
commit d6d6d88e20
6 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Entities/Enums.cs
+16 -9
View File
@@ -56,8 +56,12 @@ namespace Config.Entities
[Description("Vodoměry")] Single, [Description("Vodoměry")] Single,
[Description("Kombinované vodoměry")] Combined, [Description("Kombinované vodoměry")] Combined,
[Description("Měřiče tepla")] HeatMeter, [Description("Měřiče tepla")] HeatMeter,
#elif LANG_RU
[Description("Счетчик")] Single,
[Description("Комбинированный счетчик")] Combined,
[Description("Счетчик тепла")] HeatMeter,
#else #else
[Description("Water meters")] Single, [Description("Water meters")] Single,
[Description("Compound water meters")] Combined, [Description("Compound water meters")] Combined,
[Description("Heat meters")] HeatMeter, [Description("Heat meters")] HeatMeter,
#endif #endif
@@ -84,14 +88,13 @@ namespace Config.Entities
public enum Mounting public enum Mounting
{ {
[Description("")] NotSpecified,
#if LANG_DE #if LANG_DE
[Description("")] NotSpecified, [Description("H")] H, /// horizontal
[Description("H")] H, /// horizontal [Description("V")] V, /// vertical
[Description("V")] V, /// vertical [Description("STR")] S, /// standrohre
[Description("STR")] S, /// standrohre [Description("F")] F, /// fall
[Description("F")] F, /// fall
#else #else
[Description("")] NotSpecified,
[Description("H")] H, /// horizontal [Description("H")] H, /// horizontal
[Description("V")] V, /// vertical [Description("V")] V, /// vertical
[Description("S")] S, /// steig [Description("S")] S, /// steig
@@ -387,15 +390,19 @@ namespace Config.Entities
[Description("info")] Info, [Description("info")] Info,
[Description("ein")] On, [Description("ein")] On,
#elif LANG_CS #elif LANG_CS
[Description("vypnuto")] off, [Description("vypnuto")] Off,
[Description("info")] Info, [Description("info")] Info,
[Description("zapnuto")] On, [Description("zapnuto")] On,
#elif LANG_RU
[Description("выключен")] Off,
[Description("информация")] Info,
[Description("включенный")] On,
#elif LANG_PL #elif LANG_PL
[Description("nie")] Off, [Description("nie")] Off,
[Description("info")] Info, [Description("info")] Info,
[Description("tak")] On, [Description("tak")] On,
#else // LANG_EN #else // LANG_EN
[Description("off")] Off, [Description("off")] Off,
[Description("info")] Info, [Description("info")] Info,
[Description("on")] On, [Description("on")] On,
#endif #endif
Config/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.17.674.0")] [assembly: AssemblyVersion("2.17.686.0")]
[assembly: AssemblyFileVersion("2.17.674.0")] [assembly: AssemblyFileVersion("2.17.686.0")]
Results/Entities/MeterTestRslt.cs
+3
View File
@@ -77,6 +77,9 @@ namespace Results.Entities
#if PUCHONG_PT200 #if PUCHONG_PT200
if (!Evaluate()) return Passed ? "OK|White" : "NG|White"; if (!Evaluate()) return Passed ? "OK|White" : "NG|White";
else return Passed ? "OK|Green" : "NG|Red"; else return Passed ? "OK|Green" : "NG|Red";
#elif LANG_RU
if (!Evaluate()) return Passed ? "годный|White" : "негодный|White";
else return Passed ? "годный|Green" : "негодный|Red";
#else #else
if (!Evaluate()) return Passed ? "OK|White" : "NOK|White"; if (!Evaluate()) return Passed ? "OK|White" : "NOK|White";
else return Passed ? "OK|Green" : "NOK|Red"; else return Passed ? "OK|Green" : "NOK|Red";
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.17.681.0")] [assembly: AssemblyVersion("2.17.686.0")]
[assembly: AssemblyFileVersion("2.17.681.0")] [assembly: AssemblyFileVersion("2.17.686.0")]
Results/Resources/Strings.ru.resx
+6
View File
@@ -429,4 +429,10 @@
<data name="VName_Vol" xml:space="preserve"> <data name="VName_Vol" xml:space="preserve">
<value>Объем</value> <value>Объем</value>
</data> </data>
<data name="No" xml:space="preserve">
<value>Нет</value>
</data>
<data name="Yes" xml:space="preserve">
<value>Да</value>
</data>
</root> </root>
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.17.685.1")] [assembly: AssemblyVersion("2.17.686.1")]
[assembly: AssemblyFileVersion("2.17.685.1")] [assembly: AssemblyFileVersion("2.17.686.1")]