多语言更新

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -137,6 +137,7 @@
       <Control name="ribbonOrbOptionButton1" text="Management" />
       <Control name="ribbonTab1" text="BasicFunction" />
       <Control name="ribbonPanel3" text="File" />
+	  <Control name="ribbonPanelOthers" text="Others" />
       <Control name="rbSelTool" text="Matching" />
       <Control name="rbAllImage" text="FullMatching" />
 	  <Control name="rbWidthImage" text="WidthMatching" />
@@ -158,8 +159,9 @@
 	  <Control name="RSGrayVal" text="GrayValue" />
 	  <Control name="mouseMatter" text="MouseMatter" />
 	  <Control name="ribbonOrbMenuItem5" text="Copy" />
-	
+	  <Control name="rbHelp" text="Help" />
 	  <Control name="ribbonOrbMenuItem_Extremum" text="Extremum analysis" />
+	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="Tracing of foreign inclusions" />
 	  <Control name="message1" text="Now there are open measurement results files which will not be saved after new projects are built. Are you sure to build a new one?" />
 	  <Control name="AnalysisDiagram" text="Analysis diagram" />
 	  <Control name="AnalysisDataSheet" text="Analysis data sheet" />
@@ -303,6 +305,10 @@
 	  <Control name="cb_ELONG" text="Expansion length" />
 	  <Control name="cb_ASPECT_ELONG" text="Expanded aspect ratio" />
 	  <Control name="cb_Orientation" text="Orientation angle" />
+	  <Control name="cb_FiledCoordinate" text="FiledCoordinate" />
+	  <Control name="cB_Density" text="Density" />
+	  <Control name="cB_Electrical_conductivity" text="Electrical_conductivity" />
+	  <Control name="cB_Hardness" text="Hardness" />
     </Controls>
  </Form>
  <Form>
@@ -860,11 +866,11 @@
 	  
 	  <Control name="MouseMove1" text="Particle SEM location:" />
 	  <Control name="MouseMove2" text="Grayscale#" />
-	  
 	  <Control name="BSEOriginal" text="BSE original"/>
 	  <Control name="ClassifiedDisplay" text="Classified display"/>
 	  <Control name="OriginalSplicing" text="Original splicing"/>
 	  <Control name="OriginalDistribution" text="Original distribution"/>
+	  <Control name="ImportSTDDb" text="Import standard library"/>
     </Controls>
  </Form>
  <Form>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -137,6 +137,7 @@
       <Control name="ribbonOrbOptionButton1" text="程序管理" />
       <Control name="ribbonTab1" text="基本功能" />
       <Control name="ribbonPanel3" text="文件" />
+	  <Control name="ribbonPanelOthers" text="其它" />
       <Control name="rbSelTool" text="显示图匹配" />
       <Control name="rbAllImage" text="全图匹配" />
 	  <Control name="rbWidthImage" text="宽度匹配" />
@@ -158,8 +159,9 @@
 	  <Control name="RSGrayVal" text="灰度值" />
 	  <Control name="mouseMatter" text="鼠标点的物质" />
 	  <Control name="ribbonOrbMenuItem5" text="复制" />
-	
+	  <Control name="rbHelp" text="帮助" />
 	  <Control name="ribbonOrbMenuItem_Extremum" text="极值分析法 " />
+	  <Control name="ribbonOrbMenuItem_InclusionsTraceability" text="外来夹杂物溯源 " />
 	  <Control name="message1" text="现已经有打开的测量结果文件新建项目后将不保存，是否确定新建？" />
 	  <Control name="AnalysisDiagram" text="分析图" />
 	  <Control name="AnalysisDataSheet" text="分析数据表" />

Bin/x64/Debug/Resources/XMLData/ResourceForSTDManage-EN.xml

@@ -17,6 +17,8 @@
       <Control name="rbRecover" text="ResetToFactorySettings"/>
       <Control name="rbBackup" text="SaveAs"/>
       <Control name="rbSave" text="Save"/>
+	  <Control name="ribbon_ConvertOreDatabaseToOtsDatabase" text="Ore database is converted to ots database tool"/>
+	  <Control name="rbMatchescorrespondingelement" text="Search element information from the Amics mineral database"/>
       <Control name="language" text="EN" />
 	  <Control name="message1" text="Save successful！" />
 	  <Control name="message2" text="Save failed！"/>

Bin/x64/Debug/Resources/XMLData/ResourceForSTDManage-ZH.xml

@@ -17,6 +17,8 @@
       <Control name="rbRecover" text="恢复至原厂数据"/>
       <Control name="rbBackup" text="另存为"/>
       <Control name="rbSave" text="保存"/>
+	  <Control name="ribbon_ConvertOreDatabaseToOtsDatabase" text="矿石数据库转换为ots数据库工具"/>
+	  <Control name="rbMatchescorrespondingelement" text="从Amics矿物数据库中搜索标准条目的元素信息并移植到新库"/>
 	  <Control name="language" text="ZH" />
 	  <Control name="message1" text="保存成功！"/>
 	  <Control name="message2" text="保存失败！"/>

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -260,12 +260,12 @@ namespace OTSIncAReportApp
             ribbonPanel2.Tag = "ribbonPanel2";
             rbSelTool.Tag = "rbSelTool";
             rbChoiceTools.Tag = "rbChoiceTools";
-
+            ribbonPanelOthers.Tag = "ribbonPanelOthers";
             ribbonTab1.Tag = "ribbonTab1";
             rbMenu.Tag = "rbMenu";
 
             dpbOpen.Tag = "dpbOpen";
-
+            ribbonOrbMenuItem_Extremum.Tag = "ribbonOrbMenuItem_Extremum";
             dpbExport.Tag = "dpbExport";
             ribbonOrbOptionButton1.Tag = "ribbonOrbOptionButton1";
             ribbonOrbMenuItem_InclusionsTraceability.Tag = "ribbonOrbMenuItem_InclusionsTraceability";
@@ -363,7 +363,14 @@ namespace OTSIncAReportApp
                 }
             }
            
-
+            if(Language.ReadDefaultLanguage()=="EN")
+            {
+                rbHelp.Enabled = false;
+            }
+            else
+            {
+                rbHelp.Enabled = true;
+            }
             
 
         }

OTSPartA_STDEditor/Form_ConstantsEditor2.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form_ConstantsEditor2));
             OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new OTS.WinFormsUI.Docking.DockPanelSkin();
             OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
             OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new OTS.WinFormsUI.Docking.DockPanelGradient();
@@ -44,6 +43,7 @@
             OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new OTS.WinFormsUI.Docking.DockPanelGradient();
             OTS.WinFormsUI.Docking.TabGradient tabGradient6 = new OTS.WinFormsUI.Docking.TabGradient();
             OTS.WinFormsUI.Docking.TabGradient tabGradient7 = new OTS.WinFormsUI.Docking.TabGradient();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form_ConstantsEditor2));
             this.ribbonSeparator1 = new System.Windows.Forms.RibbonSeparator();
             this.ribbonTextBox1 = new System.Windows.Forms.RibbonTextBox();
             this.ribbonTextBox2 = new System.Windows.Forms.RibbonTextBox();
@@ -306,10 +306,10 @@
             this.rbMatchescorrespondingelement.AltKey = null;
             this.rbMatchescorrespondingelement.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
             this.rbMatchescorrespondingelement.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbMatchescorrespondingelement.Image = ((System.Drawing.Image)(resources.GetObject("rbMatchescorrespondingelement.Image")));
-            this.rbMatchescorrespondingelement.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbMatchescorrespondingelement.SmallImage")));
+            this.rbMatchescorrespondingelement.Image = global::OTSPartA_STDEditor.Properties.Resources.Ruler161;
+            this.rbMatchescorrespondingelement.SmallImage = global::OTSPartA_STDEditor.Properties.Resources.Ruler161;
             this.rbMatchescorrespondingelement.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.rbMatchescorrespondingelement.Tag = null;
+            this.rbMatchescorrespondingelement.Tag = "rbMatchescorrespondingelement";
             this.rbMatchescorrespondingelement.Text = "从Amics矿物数据库中搜索标准条目的元素信息并移植到新库";
             this.rbMatchescorrespondingelement.ToolTip = null;
             this.rbMatchescorrespondingelement.ToolTipImage = null;

OTSPartA_STDEditor/Form_ConstantsEditor2.resx

@@ -118,18 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="rbMatchescorrespondingelement.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="rbMatchescorrespondingelement.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="ribbonOrbRecentItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO

OTSPartA_STDEditor/ImportStandardLibraryTypeSelection.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -13,6 +14,8 @@ namespace OTSPartA_STDEditor
     public partial class ImportStandardLibraryTypeSelection : Form
     {
         string m_selectevent = "";
+        Language lan;
+        Hashtable table;
         public string SelectEvent
         {
             set { m_selectevent = value; }
@@ -22,6 +25,8 @@ namespace OTSPartA_STDEditor
         public ImportStandardLibraryTypeSelection()
         {
             InitializeComponent();
+            lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
         }
 
         private void bn_xray_Click(object sender, EventArgs e)