Chinese language for the 'Order' protocol

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,
         }
 

TestBenchFramework/MainWnd.resx

@@ -463,7 +463,7 @@
     <value>processTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.Screens.ProcessTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.Screens.ProcessTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
     <value>processTabPage</value>
@@ -517,7 +517,7 @@
     <value>MeasurementTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;MeasurementTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;MeasurementTabPageCtrl.Parent" xml:space="preserve">
     <value>measurementTabPage</value>
@@ -592,7 +592,7 @@
     <value>picturesTabPageCtrl1</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl1.Type" xml:space="preserve">
-    <value>TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl1.Parent" xml:space="preserve">
     <value>picturesTabPage</value>
@@ -646,7 +646,7 @@
     <value>resultsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.Screens.ResultsTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.Screens.ResultsTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
     <value>resultsTabPage</value>
@@ -700,7 +700,7 @@
     <value>logsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;logsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.Screens.LogsTabPageCtrl, TBF, Version=1.2.5.2, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.Screens.LogsTabPageCtrl, TBF, Version=1.2.10.7, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;logsTabPageCtrl.Parent" xml:space="preserve">
     <value>logsTabPage</value>
@@ -1119,6 +1119,9 @@
   <data name="&gt;&gt;mainMenuStrip.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>zh-Hans</value>
+  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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));
 		}
 
 		/// <summary>

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");
 			}

TestBenchFramework/Resources/Strings.Designer.cs

@@ -1392,6 +1392,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Page.
+        /// </summary>
+        internal static string Page {
+            get {
+                return ResourceManager.GetString("Page", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Parameters.
         /// </summary>

TestBenchFramework/Resources/Strings.cn.Designer.cs

@@ -59,5 +59,86 @@ namespace TBF.Resources {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ambient humidity / 空气温度:.
+        /// </summary>
+        internal static string Ambient_humidity_ {
+            get {
+                return ResourceManager.GetString("Ambient_humidity_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ambient pressure / 大气压强:.
+        /// </summary>
+        internal static string Ambient_pressure_ {
+            get {
+                return ResourceManager.GetString("Ambient_pressure_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ambient temperature / 空气温度:.
+        /// </summary>
+        internal static string Ambient_temperature_ {
+            get {
+                return ResourceManager.GetString("Ambient_temperature_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Approval / 审核:.
+        /// </summary>
+        internal static string Approval_ {
+            get {
+                return ResourceManager.GetString("Approval_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Date and time / 日期及时间: .
+        /// </summary>
+        internal static string Date_and_time_ {
+            get {
+                return ResourceManager.GetString("Date_and_time_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Page/页面 .
+        /// </summary>
+        internal static string Page {
+            get {
+                return ResourceManager.GetString("Page", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Procedure / 测试程序:.
+        /// </summary>
+        internal static string Procedure_ {
+            get {
+                return ResourceManager.GetString("Procedure_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Purchase order / 采购订单:.
+        /// </summary>
+        internal static string Purchase_order_ {
+            get {
+                return ResourceManager.GetString("Purchase_order_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Tester / 测试者:.
+        /// </summary>
+        internal static string Tester_ {
+            get {
+                return ResourceManager.GetString("Tester_", resourceCulture);
+            }
+        }
     }
 }

TestBenchFramework/Resources/Strings.cn.resx

@@ -1,101 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-	<!-- 
+  <!-- 
-		Microsoft ResX Schema
+    Microsoft ResX Schema 
     
-		Version 1.3
+    Version 2.0
     
-		The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes 
-		associated with the data types.
+    associated with the data types.
     
-		Example:
+    Example:
     
-		... ado.net/XML headers & schema ...
+    ... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
+    <resheader name="version">2.0</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
-		</data>
+    </data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-		</data>
+        <comment>This is a comment</comment>
+    </data>
                 
-		There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple 
-		name/value pairs.
+    name/value pairs.
     
-		Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the 
-		mimetype set.
+    mimetype set.
     
-		The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
     
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
+    read any of the formats listed below.
     
-		mimetype: application/x-microsoft.net.object.binary.base64
+    mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
+    value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
     
-		mimetype: application/x-microsoft.net.object.soap.base64
+    mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
+    value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
 
-		mimetype: application/x-microsoft.net.object.bytearray.base64
+    mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
+            : using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-	-->
+    -->
-	
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-		<xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
+      <xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
+        <xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
+          <xsd:element name="metadata">
-						<xsd:complexType>
+            <xsd:complexType>
-							<xsd:sequence>
+              <xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
-							</xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
-						</xsd:complexType>
+            </xsd:complexType>
-					</xsd:element>
+          </xsd:element>
-					<xsd:element name="resheader">
+          <xsd:element name="assembly">
-						<xsd:complexType>
+            <xsd:complexType>
-							<xsd:sequence>
+              <xsd:attribute name="alias" type="xsd:string" />
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" />
-							</xsd:sequence>
+            </xsd:complexType>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
+          </xsd:element>
-						</xsd:complexType>
+          <xsd:element name="data">
-					</xsd:element>
+            <xsd:complexType>
-				</xsd:choice>
+              <xsd:sequence>
-			</xsd:complexType>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-		</xsd:element>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-	</xsd:schema>
+              </xsd:sequence>
-	<resheader name="resmimetype">
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-		<value>text/microsoft-resx</value>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-	</resheader>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-	<resheader name="version">
+              <xsd:attribute ref="xml:space" />
-		<value>1.3</value>
+            </xsd:complexType>
-	</resheader>
+          </xsd:element>
-	<resheader name="reader">
+          <xsd:element name="resheader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+            <xsd:complexType>
-	</resheader>
+              <xsd:sequence>
-	<resheader name="writer">
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+              </xsd:sequence>
-	</resheader>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Ambient humidity / 空气温度:</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Ambient pressure / 大气压强:</value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Ambient temperature / 空气温度:</value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Approval / 审核:</value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Date and time / 日期及时间: </value>
+  </data>
+  <data name="Page" xml:space="preserve">
+    <value>Page/页面 </value>
+  </data>
+  <data name="Procedure_" xml:space="preserve">
+    <value>Procedure / 测试程序:</value>
+  </data>
+  <data name="Purchase_order_" xml:space="preserve">
+    <value>Purchase order / 采购订单:</value>
+  </data>
+  <data name="Tester_" xml:space="preserve">
+    <value>Tester / 测试者:</value>
+  </data>
 </root>

TestBenchFramework/Resources/Strings.resx

@@ -1021,4 +1021,7 @@
   <data name="Tester_" xml:space="preserve">
     <value>Tester: </value>
   </data>
+  <data name="Page" xml:space="preserve">
+    <value>Page</value>
+  </data>
 </root>