Merge remote-tracking branch 'origin/master'

Language/en_US.xaml

@@ -10,7 +10,7 @@
     <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="NameType">EN_NAME</sys:String>
     
     <sys:String x:Key="DiamondSelect">Diamond Selection</sys:String>
     <sys:String x:Key="DetectionResult">Detection Result</sys:String>