diff --git a/Language/en_US.xaml b/Language/en_US.xaml
index b301fc8..df45989 100644
--- a/Language/en_US.xaml
+++ b/Language/en_US.xaml
@@ -2,55 +2,200 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=netstandard">
     <!--Text-->
-    <sys:String x:Key="ProcName">Spark</sys:String>
+    <sys:String x:Key="ProcName">Starshine</sys:String>
     
-    <sys:String x:Key="StartTest">Start Test</sys:String>
+    <sys:String x:Key="StartTest">Start Detection</sys:String>
+    <sys:String x:Key="StartTestFan">MEASURE</sys:String>
     <sys:String x:Key="Config">Configuration</sys:String>
+    <sys:String x:Key="ConfigFan">SETTING</sys:String>
     <sys:String x:Key="Help">Help</sys:String>
+    <sys:String x:Key="HelpFan">HELP</sys:String>
+    <sys:String x:Key="NameType">NAME</sys:String>
     
     <sys:String x:Key="DiamondSelect">Diamond Selection</sys:String>
-    <sys:String x:Key="DetectionResult">Detection Results</sys:String>
-    <sys:String x:Key="StartDetection">Starting detection, please wait</sys:String>
+    <sys:String x:Key="DetectionResult">Detection Result</sys:String>
+    <sys:String x:Key="StartDetection">Starting detection, please wait...</sys:String>
     
     <sys:String x:Key="ImportModel">Import Template</sys:String>
     <sys:String x:Key="Save">Update and Save</sys:String>
-    <sys:String x:Key="AddRow">Add {0} Rows</sys:String>
+    <sys:String x:Key="AddRow">Add Row</sys:String>
     
     <sys:String x:Key="AlgorithmConfig">Algorithm Configuration</sys:String>
     <sys:String x:Key="LevelConfig">Grading Configuration</sys:String>
-    <sys:String x:Key="CutConfig">Cut Configuration</sys:String>
+    <sys:String x:Key="CutConfig">Cutting Tool Configuration</sys:String>
+    <sys:String x:Key="NoPassword">Username or password incorrect, please try again</sys:String>
+    <sys:String x:Key="DeleteConfig">Delete Configuration</sys:String>
+    <sys:String x:Key="ImportConfig">Import Configuration</sys:String>
+    <sys:String x:Key="BeautifyJson">Beautify Json</sys:String>
+    <sys:String x:Key="UglifyJson">Compress Json</sys:String>
     
-    <sys:String x:Key="ExitAsk">Do you want to exit the application?</sys:String>
+
+    <sys:String x:Key="ExitAsk">Do you want to exit the program?</sys:String>
     <sys:String x:Key="ExitAskTitle">Exit Confirmation</sys:String>
-    <sys:String x:Key="GRADE_NAME">GRADE_EN_NAME</sys:String>
-    <sys:String x:Key="STANDARD_NAME">STANDARD_EN_NAME</sys:String>
-    <sys:String x:Key="SHAPE_NAME">SHAPE_EN_NAME</sys:String>
-    <sys:String x:Key="INSTITUTE_NAME">INSTITUTE_EN_NAME</sys:String>
-    <sys:String x:Key="RULE_NAME">RULE_EN_NAME</sys:String>
-    <sys:String x:Key="NameType">EN_NAME</sys:String>
-    <!--检测结果 报表-->
+    <sys:String x:Key="Yes">Yes</sys:String>
+    <sys:String x:Key="No">No</sys:String>
+    <sys:String x:Key="Cancel">Cancel</sys:String>
+    <sys:String x:Key="Confirm">Confirm</sys:String>
+    <!-- Grading Configuration Screen -->
+    <sys:String x:Key="Save_successful_message">Data saved successfully</sys:String>
+    <sys:String x:Key="save_fail_message">Data save failed</sys:String>
+    <sys:String x:Key="no_data_message">No data imported</sys:String>
+    <sys:String x:Key="grade_config_left_top">Parameters \\ Cutting Grade</sys:String>
+    <sys:String x:Key="GRADE_NAME">GRADE_NAME</sys:String>
+    <sys:String x:Key="STANDARD_NAME">STANDARD_NAME</sys:String>
+    <sys:String x:Key="SHAPE_NAME">SHAPE_NAME</sys:String>
+    <sys:String x:Key="INSTITUTE_NAME">INSTITUTE_NAME</sys:String>
+    <sys:String x:Key="RULE_NAME">RULE_NAME</sys:String>
+    <!-- Start Detection Button Popup-->
+    <sys:String x:Key="UpdateDiamondCode">Please enter the diamond code to upload</sys:String>
+    <sys:String x:Key="ok">OK</sys:String>
+    <sys:String x:Key="Skip">Skip</sys:String>
+    <sys:String x:Key="NoDiamondCode">No diamond code entered</sys:String>
+    <!-- Algorithm Configuration Screen -->
+    <sys:String x:Key="SaveSuccess">Save Successful</sys:String>
+    <sys:String x:Key="SaveFail">Save Failed</sys:String>
+    <!-- Diamond Selection Screen -->
+    <sys:String x:Key="圆形">Round</sys:String>
+    <sys:String x:Key="六边形">Hexagon</sys:String>
+    <sys:String x:Key="枕形">Cushion</sys:String>
+    <sys:String x:Key="梨形">Pear</sys:String>
+    <sys:String x:Key="公主方形">Princess Square</sys:String>
+    <sys:String x:Key="椭圆形">Oval</sys:String>
+    <sys:String x:Key="祖母绿形">Emerald</sys:String>
+    <sys:String x:Key="异形钻">Fancy Shape</sys:String>
+    <!-- loading -->
+    <sys:String x:Key="wait">Detecting, please wait...</sys:String>
+    <sys:String x:Key="waitExport">Generating file, please wait...</sys:String>
+    <!-- Detection Result Report -->
     <sys:String x:Key="Avg">Average</sys:String>
-	
-    <!--定级配置 报表-->
+    
+    <!-- Grading Configuration Report -->
     <sys:String x:Key="Demo2">Button</sys:String>
     
-    <!--算法配置 报表-->
+    <!-- Algorithm Configuration Report -->
     <sys:String x:Key="Demo1">Button</sys:String>
+    <!-- System Configuration -->
+    <sys:String x:Key="SaveAs">Save</sys:String>
+    <sys:String x:Key="System Settings">System Configuration</sys:String>
+    <sys:String x:Key="LanguageSettings">Language Settings</sys:String>
+    <sys:String x:Key="UpdateFile">Upload File</sys:String>
+    <sys:String x:Key="TxtFile">TXT File</sys:String>
+    <sys:String x:Key="StlFile">STL File</sys:String>
+    <sys:String x:Key="ExcelFile">Excel File</sys:String>
+    <sys:String x:Key="DatFile">Dat File</sys:String>
+    <sys:String x:Key="SavePath">Save Path</sys:String>
+    <sys:String x:Key="Please enter">Please enter</sys:String>
+    <sys:String x:Key="Select">Select</sys:String>
+    <sys:String x:Key="GradeStandard">Grading Standard</sys:String>
+    <sys:String x:Key="SavePathIsnotExists">Save path does not exist</sys:String>
+    
+    <!-- System Configuration Multilingual -->
+    <sys:String x:Key="SystemSetting">System Settings</sys:String>
+    <sys:String x:Key="SystemSettingCustomSet">General Settings</sys:String>
+    <sys:String x:Key="SystemSettingModelSet">Model Settings</sys:String>
+    <sys:String x:Key="SystemSettingSave">Save/Save</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetLanguageSet">Language Settings</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetUploadFileSet">Upload Files</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetUploadFileText">TXT Files</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetUploadFileStl">STL Files</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetUploadFileExcel">Excel Files</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetUploadFileDat">DAT Files</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetSavePath">Save Path</sys:String>
+    <sys:String x:Key="SystemSettingCustomSelectPath">Select</sys:String>
+    <sys:String x:Key="SystemSettingCustomSelectPathTip">Please select</sys:String>
+    <sys:String x:Key="SystemSettingCustomSetLevel">Grading Standard</sys:String>
+    <sys:String x:Key="SystemSettingModelSetDefaultColor">Main Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetTurnColor">Interaction Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetTypeColor">Face Category Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetMainFaceColor">Main Face Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetMainBorderColor">Border Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetSelectedColor">Selected Face Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetSelectedBorderColor">Selected Face Border Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetSelectedTypeColor">Selected Face Category Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetSelectedTextColor">Selected Face Text Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetSelectedLineColor">Identification Line Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetSelectedPosdColor">Positive Direction Mark Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetErrorColor">Defect Face Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetTableColor">Table Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetUpperColor">Kite Face Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetStarColor">Star Facet Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetUpperGirdleColor">Upper Girdle Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetGirdleColor">Girdle Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetPavilionColor">Pavilion Main Facet Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetLowerGirdleColor">Lower Girdle Color</sys:String>
+    <sys:String x:Key="SystemSettingModelSetCuletColor">Culet Color</sys:String>
+    <!-- Dialog Default Language -->
+    <sys:String x:Key="DialogConfirmDefaultTitle">Confirm</sys:String>
+    <sys:String x:Key="DialogCancelDefaultTitle">Cancel</sys:String>
+    
+    
+    <!-- 3D Right Click Menu -->
+    <sys:String x:Key="ViewportRightMenuFront">Front View</sys:String>
+    <sys:String x:Key="ViewportRightMenuSaveViewToPNG">Save Current View to PNG</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowModelFace">Show Model Face</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowModelFaceByType">Show Model Face Classification Mark</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowModelFrame">Show Model Frame</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowLighting">Show Lighting</sys:String>
+    <sys:String x:Key="ViewportRightMenuSelectFace">Double-click to Select Face</sys:String>
+    <sys:String x:Key="ViewportRightMenuSelectFaceFrame">Show Selected Face Frame</sys:String>
+    <sys:String x:Key="ViewportRightMenuSelectFaceLengthText">Show Selected Face Frame Length Text</sys:String>
+    <sys:String x:Key="ViewportRightMenuSelectFaceAngleText">Show Selected Face Angle Text</sys:String>
+    <sys:String x:Key="ViewportRightMenuSelectFaceText">Show Associated Info Text</sys:String>
+    <sys:String x:Key="ViewportRightMenuSelectFaceKind">Show Similar Faces</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowDefectFace">Show Defective Faces</sys:String>
+    <sys:String x:Key="ViewportRightMenuShowFront">Show Positive Direction Mark</sys:String>
+    <sys:String x:Key="ViewportSaveSucceed">Save Successful</sys:String>
+    <sys:String x:Key="ViewportSaveFail">Save Failed</sys:String>
+    <sys:String x:Key="ViewportSelectPath">Select Path</sys:String>
+    
+    <!-- Login Page -->
+    <sys:String x:Key="LoginWindowTitle">Starshine Diamond Detection System</sys:String>
+    <sys:String x:Key="LoginWindowAccount">Account</sys:String>
+    <sys:String x:Key="LoginWindowPassword">Password</sys:String>
+    <sys:String x:Key="LoginWindowRemember">Remember Password</sys:String>
+    <sys:String x:Key="LoginWindowLogin">Login</sys:String>
+    <sys:String x:Key="LoginWindowExit">Exit System</sys:String>
+    <sys:String x:Key="LoginWindowForgot">If you forgot your password, please contact us</sys:String>
+    
+    <!-- New Detection Results -->
+    <sys:String x:Key="DiamondResultSave">Save</sys:String>
+    <sys:String x:Key="DiamondResultExport">Export</sys:String>
+    <sys:String x:Key="DiamondResultDs">DS</sys:String>
+    <sys:String x:Key="DiamondResultStandard">Standard</sys:String>
+    <sys:String x:Key="DiamondResultShape">Shape</sys:String>
+    <sys:String x:Key="DiamondResultCrown">Crown</sys:String>
+    <sys:String x:Key="DiamondResultPavilion">Pavilion</sys:String>
+    <sys:String x:Key="DiamondResultWeight">Weight (ct)</sys:String>
+    <sys:String x:Key="DiamondResultCutGrade">Cut Grade</sys:String>
+    <sys:String x:Key="DiamondResultSymmetryGrade">Symmetry Grade</sys:String>
+    <sys:String x:Key="DiamondResultGridAvgValue">Average</sys:String>
+    <sys:String x:Key="DiamondResultGridDeviationValue">Deviation</sys:String>
+    <sys:String x:Key="DiamondResultGridMaxValue">Max Value</sys:String>
+    <sys:String x:Key="DiamondResultGridMinValue">Min Value</sys:String>
+    <sys:String x:Key="DiamondResultGridCutLevel">Cut Level</sys:String>
+    <sys:String x:Key="DiamondResultGridSymLevel">SYM Level</sys:String>
+    <sys:String x:Key="DiamondResultPopupFacet1">Facet 1</sys:String>
+    <sys:String x:Key="DiamodResultCloseConfirm">Are you sure you want to close the detection results screen?</sys:String>
+
+        <!-- External Interface Messages-->
+    <sys:String x:Key="InProgress">S001: Image capture in progress</sys:String>   
+    <sys:String x:Key="CacheCleared">S002: Cache image cleared</sys:String>   
+    <sys:String x:Key="CannotSendCommand">S003: Unable to send command to microcontroller</sys:String>   
+    <sys:String x:Key="MicrocontrollerTimeout">S004: Microcontroller access timeout</sys:String>   
+    <sys:String x:Key="MicrocontrollerError">S005: Microcontroller returned error code</sys:String>   
+    <sys:String x:Key="CameraNotConnected">S006: Camera not connected</sys:String>   
+    <sys:String x:Key="DeviceNotFound">P001: Cutting tool not found</sys:String>     
+    <sys:String x:Key="AlgorithmFailed">P002: Algorithm call failed</sys:String>     
+    <sys:String x:Key="ImageFileReadFailure">P003: Image file read failed</sys:String>     
+    <sys:String x:Key="JsonParseFailure">P004: JSON parse failed</sys:String>   
+    <sys:String x:Key="Recheck">P021: Diamond requires cleaning</sys:String>       
+    <sys:String x:Key="NoDiamond">P011: No diamond detected</sys:String>   
+    <sys:String x:Key="OpenOfTheHatch">Please check if the cutting tool door is closed</sys:String>     
+    
+    
+    <sys:String x:Key="ApplicationError">Application error:</sys:String>
+    <sys:String x:Key="CUDANoInstall">CUDA not installed, program may encounter errors during execution</sys:String>
+    <sys:String x:Key="MSVCRuntimeNoInstall">MSVC Runtime not installed, program may encounter errors during execution</sys:String>
+    <sys:String x:Key="FilePathNotExists">File path does not exist</sys:String>
 
-    <!-- 外部接口MSG-->
-    <sys:String x:Key="InProgress">S001:Drawing is in progress</sys:String>   
-    <sys:String x:Key="CacheCleared">S002:Cached images are cleared</sys:String>   
-    <sys:String x:Key="CannotSendCommand">S003:Unable to send instructions tNo the SOC</sys:String>   
-    <sys:String x:Key="MicrocontrollerTimeout">S004:Microcontroller access timeout</sys:String>   
-    <sys:String x:Key="MicrocontrollerError">S005:The microcontroller returns an error code</sys:String>   
-    <sys:String x:Key="CameraNotConnected">S006:Camera not connected</sys:String>   
-    <sys:String x:Key="DeviceNotFound">P001:Cutter not found</sys:String>     
-    <sys:String x:Key="AlgorithmFailed">P002:Algorithm call failed</sys:String>     
-    <sys:String x:Key="ImageFileReadFailure">P003:Failed to read the image file</sys:String>     
-    <sys:String x:Key="JsonParseFailure">P004:JSON parsing failed</sys:String> 
-    <sys:String x:Key="Recheck">P021:Diamonds need to be cleaned if detected</sys:String>       
-    <sys:String x:Key="NoDiamond">P011:No diamond was detected</sys:String> 
-    <sys:String x:Key="OpenOfTheHatch">Check whether the cutting machine hatch is closed</sys:String> 
-    
-    <sys:String x:Key="MSVCRuntimeNoInstall">MSVC Runtime is not installed and errors may occur during program execution</sys:String>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>