diff --git a/TestBenchFramework/LocalSettings.cs b/TestBenchFramework/LocalSettings.cs
index 87707b0b7..c59440396 100644
--- a/TestBenchFramework/LocalSettings.cs
+++ b/TestBenchFramework/LocalSettings.cs
@@ -24,16 +24,16 @@ namespace TBF
{
en,
de,
- fr,
- es,
- it,
- ru,
- pl,
- cz,
- sk,
- hu,
- ro,
cn,
+ //fr,
+ //es,
+ //it,
+ //ru,
+ //pl,
+ //cz,
+ //sk,
+ //hu,
+ //ro,
Count,
}
diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx
index bd5e0de34..7eae5edbb 100644
--- a/TestBenchFramework/MainWnd.resx
+++ b/TestBenchFramework/MainWnd.resx
@@ -463,7 +463,7 @@
processTabPageCtrl
- TBF.Screens.ProcessTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null
+ TBF.Screens.ProcessTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null
processTabPage
@@ -517,7 +517,7 @@
MeasurementTabPageCtrl
- TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null
+ TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null
measurementTabPage
@@ -592,7 +592,7 @@
picturesTabPageCtrl1
- TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null
+ TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null
picturesTabPage
@@ -646,7 +646,7 @@
resultsTabPageCtrl
- TBF.Screens.ResultsTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null
+ TBF.Screens.ResultsTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null
resultsTabPage
@@ -700,7 +700,7 @@
logsTabPageCtrl
- TBF.Screens.LogsTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null
+ TBF.Screens.LogsTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null
logsTabPage
@@ -1119,6 +1119,9 @@
2
+
+ zh-Hans
+
True
diff --git a/TestBenchFramework/PrintOrderDocument.cs b/TestBenchFramework/PrintOrderDocument.cs
index 77d135a59..ac317e01a 100644
--- a/TestBenchFramework/PrintOrderDocument.cs
+++ b/TestBenchFramework/PrintOrderDocument.cs
@@ -361,7 +361,7 @@ namespace TBF
///----------
/// Footer
///----------
- PrintAt(e, leftMargin, topMargin + printHeight - SpacingOne, string.Format("Page {0}/{1}", pageNr++, nrPages));
+ PrintAt(e, leftMargin, topMargin + printHeight - SpacingOne, string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages));
}
///
diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs
index 5fda62ca9..afcf48388 100644
--- a/TestBenchFramework/Program.cs
+++ b/TestBenchFramework/Program.cs
@@ -131,8 +131,9 @@ namespace TBF
{
System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(LocalSettings.Language);
}
- catch
+ catch (Exception e)
{
+ string msg = e.Message;
MessageBox.Show("Selected language not supported.\nUsing English.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en");
}
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index 489954858..0b9360ea8 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -1392,6 +1392,15 @@ namespace TBF.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Page.
+ ///
+ internal static string Page {
+ get {
+ return ResourceManager.GetString("Page", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Parameters.
///
diff --git a/TestBenchFramework/Resources/Strings.cn.Designer.cs b/TestBenchFramework/Resources/Strings.cn.Designer.cs
index 61654016a..e01454c61 100644
--- a/TestBenchFramework/Resources/Strings.cn.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.cn.Designer.cs
@@ -59,5 +59,86 @@ namespace TBF.Resources {
resourceCulture = value;
}
}
+
+ ///
+ /// Looks up a localized string similar to Ambient humidity / 空气温度:.
+ ///
+ internal static string Ambient_humidity_ {
+ get {
+ return ResourceManager.GetString("Ambient_humidity_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Ambient pressure / 大气压强:.
+ ///
+ internal static string Ambient_pressure_ {
+ get {
+ return ResourceManager.GetString("Ambient_pressure_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Ambient temperature / 空气温度:.
+ ///
+ internal static string Ambient_temperature_ {
+ get {
+ return ResourceManager.GetString("Ambient_temperature_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Approval / 审核:.
+ ///
+ internal static string Approval_ {
+ get {
+ return ResourceManager.GetString("Approval_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Date and time / 日期及时间: .
+ ///
+ internal static string Date_and_time_ {
+ get {
+ return ResourceManager.GetString("Date_and_time_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Page/页面 .
+ ///
+ internal static string Page {
+ get {
+ return ResourceManager.GetString("Page", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Procedure / 测试程序:.
+ ///
+ internal static string Procedure_ {
+ get {
+ return ResourceManager.GetString("Procedure_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Purchase order / 采购订单:.
+ ///
+ internal static string Purchase_order_ {
+ get {
+ return ResourceManager.GetString("Purchase_order_", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Tester / 测试者:.
+ ///
+ internal static string Tester_ {
+ get {
+ return ResourceManager.GetString("Tester_", resourceCulture);
+ }
+ }
}
}
diff --git a/TestBenchFramework/Resources/Strings.cn.resx b/TestBenchFramework/Resources/Strings.cn.resx
index 4fdb1b6af..1c0b5a905 100644
--- a/TestBenchFramework/Resources/Strings.cn.resx
+++ b/TestBenchFramework/Resources/Strings.cn.resx
@@ -1,101 +1,147 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 1.3
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Ambient humidity / 空气温度:
+
+
+ Ambient pressure / 大气压强:
+
+
+ Ambient temperature / 空气温度:
+
+
+ Approval / 审核:
+
+
+ Date and time / 日期及时间:
+
+
+ Page/页面
+
+
+ Procedure / 测试程序:
+
+
+ Purchase order / 采购订单:
+
+
+ Tester / 测试者:
+
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index 085b626e6..8d34baddd 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -1021,4 +1021,7 @@
Tester:
+
+ Page
+
\ No newline at end of file