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

German only text when a camera was not detected on startup.

Browse Source
This commit is contained in:
Milan Hanajik
2017-03-08 06:52:18 +01:00
parent 0370d1f582
commit 08b47776ec
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
+2 -2
View File
@@ -12,6 +12,7 @@ using System.Timers;
using log4net; using log4net;
using Config.Entities; using Config.Entities;
using TBF.BenchControl.Network.Telnet; using TBF.BenchControl.Network.Telnet;
using TBF.Resources;
using WinSCP; using WinSCP;
namespace TBF.BenchControl.Network.Camera.CLP1611 namespace TBF.BenchControl.Network.Camera.CLP1611
@@ -143,14 +144,13 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
out hardware, out revision, out serial, out sdCardVer); out hardware, out revision, out serial, out sdCardVer);
if (CameraCfg.DebugLevel == DebugMode.AutoDetect) if (CameraCfg.DebugLevel == DebugMode.AutoDetect)
{ {
CameraCfg.DebugLevel = cameraDetected ? DebugMode.DetectedOn : DebugMode.DetectedOff; CameraCfg.DebugLevel = cameraDetected ? DebugMode.DetectedOn : DebugMode.DetectedOff;
} }
else if (!cameraDetected) else if (!cameraDetected)
{ {
throw new Exception(string.Format("'{0}' with address {1} not detected", Name, CameraCfg.HardwareAddress)); throw new Exception(string.Format("{0}={1}", Strings.Address, CameraCfg.HardwareAddress));
} }
if (cameraDetected) if (cameraDetected)
TestBenchFramework/Resources/Strings.Designer.cs
Generated
+2 -2
View File
@@ -1420,7 +1420,7 @@ namespace TBF.Resources {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Failed to initialize component {0}{1}{2}. /// Looks up a localized string similar to Failed to initialize component &apos;{0}&apos;:{1}{2}.
/// </summary> /// </summary>
internal static string Failed_to_initialize_component_0_1_2 { internal static string Failed_to_initialize_component_0_1_2 {
get { get {
@@ -1429,7 +1429,7 @@ namespace TBF.Resources {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Failed to initialize device {0}{1}{2}. /// Looks up a localized string similar to Failed to initialize device &apos;{0}&apos;:{1}{2}.
/// </summary> /// </summary>
internal static string Failed_to_initialize_device_0_1_2 { internal static string Failed_to_initialize_device_0_1_2 {
get { get {
TestBenchFramework/Resources/Strings.de.resx
+2 -2
View File
@@ -1369,10 +1369,10 @@
<value>Wollen sie die Änderungen speichern?</value> <value>Wollen sie die Änderungen speichern?</value>
</data> </data>
<data name="Failed_to_initialize_component_0_1_2" xml:space="preserve"> <data name="Failed_to_initialize_component_0_1_2" xml:space="preserve">
<value>Fehler beim Komponentestart {0}{1}{2}</value> <value>Fehler beim Komponentestart '{0}':{1}{2}</value>
</data> </data>
<data name="Failed_to_initialize_device_0_1_2" xml:space="preserve"> <data name="Failed_to_initialize_device_0_1_2" xml:space="preserve">
<value>Fehler beim Gerätstart {0}{1}{2}</value> <value>Fehler beim Gerätstart '{0}':{1}{2}</value>
</data> </data>
<data name="Do_you_want_to_retry_RoI_detection" xml:space="preserve"> <data name="Do_you_want_to_retry_RoI_detection" xml:space="preserve">
<value>Möchten Sie die Erkennung erneut versuchen?</value> <value>Möchten Sie die Erkennung erneut versuchen?</value>
TestBenchFramework/Resources/Strings.resx
+2 -2
View File
@@ -1625,10 +1625,10 @@
<value>User code</value> <value>User code</value>
</data> </data>
<data name="Failed_to_initialize_device_0_1_2" xml:space="preserve"> <data name="Failed_to_initialize_device_0_1_2" xml:space="preserve">
<value>Failed to initialize device {0}{1}{2}</value> <value>Failed to initialize device '{0}':{1}{2}</value>
</data> </data>
<data name="Failed_to_initialize_component_0_1_2" xml:space="preserve"> <data name="Failed_to_initialize_component_0_1_2" xml:space="preserve">
<value>Failed to initialize component {0}{1}{2}</value> <value>Failed to initialize component '{0}':{1}{2}</value>
</data> </data>
<data name="Do_you_want_to_retry_RoI_detection" xml:space="preserve"> <data name="Do_you_want_to_retry_RoI_detection" xml:space="preserve">
<value>Do you want to retry RoI detection?</value> <value>Do you want to retry RoI detection?</value>