整理 中文字符串放到 Themes/StringResources/zh/

Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/Themes/StringResources/en/StringResource.WinderPanel.xaml

@@ -79,12 +79,12 @@
     <system:String x:Key="str.Down.T1VelocityPanel.T1">T1</system:String>
     <system:String x:Key="str.Down.T1VelocityPanel.Speed">Speed</system:String>
 
-    <system:String x:Key="str.Down.VelocityCtrlPanel.T1">T1</system:String>
-    <system:String x:Key="str.Down.VelocityCtrlPanel.T2">T2</system:String>
-    <system:String x:Key="str.Down.VelocityCtrlPanel.T3">T3</system:String>
+    <system:String x:Key="str.Down.VelocityCtrlPanel.T1">Tranction#1</system:String>
+    <system:String x:Key="str.Down.VelocityCtrlPanel.T2">Tranction#2</system:String>
+    <system:String x:Key="str.Down.VelocityCtrlPanel.T3">Tranction#3</system:String>
     <system:String x:Key="str.Down.VelocityCtrlPanel.OutsideWinder">Outside</system:String>
     <system:String x:Key="str.Down.VelocityCtrlPanel.InsideWinder">Inside</system:String>
-    <system:String x:Key="str.Down.VelocityCtrlPanel.TensionSet">T.Set</system:String>
+    <system:String x:Key="str.Down.VelocityCtrlPanel.TensionSet">Tens.Set</system:String>
     <system:String x:Key="str.Down.VelocityCtrlPanel.Tension">Tension</system:String>
     <system:String x:Key="str.Down.VelocityCtrlPanel.MotorCurrent">Current</system:String>
     <system:String x:Key="str.Down.VelocityCtrlPanel.Mode">Mode</system:String>

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/App.xaml

@@ -12,7 +12,7 @@
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
                 
                 <!--项目字符串-->
-                <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
 
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="GroupBox" />

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/FLY.FeedbackRenZiJia.UI.Client.csproj

@@ -88,7 +88,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.DynArea.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -96,7 +96,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgHeatAnalyse.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgHeatAnalyse.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -104,7 +104,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Graph.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Graph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -128,27 +128,27 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.WdLoadHeatsFile.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.WdLoadHeatsFile.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.STABILITY.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.STABILITY.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgSetup.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgSetup.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMenu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Menu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/App.xaml

@@ -7,7 +7,7 @@
                 <ResourceDictionary Source="Themes/Styles.xaml"/>
                 <ResourceDictionary Source="Converters/Converters.xaml" />
 
-                <ResourceDictionary Source="Themes/StringResources/StringResource.xaml" />
+                <ResourceDictionary Source="Themes/StringResources/zh/StringResource.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/FLY.FeedbackRenZiJia.UI.Server.csproj

@@ -124,11 +124,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMain.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMain.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/Themes/StringResources/StringResource.xaml → Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/Themes/StringResources/zh/StringResource.xaml

@@ -6,6 +6,6 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--项目报警项 字符串-->
-    <ResourceDictionary x:Key="dict.AirRing.StringResource.ERRNO" Source="pack://application:,,,/FLY.FeedbackRenZiJia;component/Themes/StringResources/StringResource.ERRNO.xaml" />
+    <ResourceDictionary x:Key="dict.AirRing.StringResource.ERRNO" Source="pack://application:,,,/FLY.FeedbackRenZiJia;component/Themes/StringResources/zh/StringResource.ERRNO.xaml" />
 
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.csproj

@@ -137,7 +137,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.ERRNO.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.ERRNO.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.IBC/FLY.IBC.UI.Client/FLY.IBC.UI.Client.csproj

@@ -123,35 +123,35 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.DynArea.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Graph.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Graph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Menu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMenu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgTempAreaParam.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgTempAreaParam.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgSystem.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgSystem.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgWidthTable.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgWidthTable.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.IBC/FLY.IBC.UI.Server/App.xaml

@@ -8,7 +8,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Themes/Styles.xaml" />
                 <ResourceDictionary Source="Converters/Converters.xaml" />
-                <ResourceDictionary Source="Themes/StringResources/StringResource.xaml" />
+                <ResourceDictionary Source="Themes/StringResources/zh/StringResource.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

Project.FLY.IBC/FLY.IBC.UI.Server/FLY.IBC.UI.Server.csproj

@@ -127,11 +127,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMain.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMain.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.IBC/FLY.IBC.UI.Server/Themes/StringResources/StringResource.xaml → Project.FLY.IBC/FLY.IBC.UI.Server/Themes/StringResources/zh/StringResource.xaml

@@ -7,5 +7,5 @@
     
     <!--项目报警项 字符串-->
     <ResourceDictionary x:Key="dict.IBC.StringResource.ERRNO"
-                        Source="pack://application:,,,/FLY.IBC;component/Themes/StringResources/StringResource.ERRNO.xaml" />
+                        Source="pack://application:,,,/FLY.IBC;component/Themes/StringResources/zh/StringResource.ERRNO.xaml" />
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.IBC/FLY.IBC/FLY.IBC.csproj

@@ -113,7 +113,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.ERRNO.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.ERRNO.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/App.xaml

@@ -13,7 +13,7 @@
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
 
                 <!--项目字符串-->
-                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI.Fix.Client;component/Themes/StringResources/StringResource.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI.Fix.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="GroupBox" />

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj

@@ -245,11 +245,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.H.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.H.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Themes/StringResources/StringResource.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Themes/StringResources/zh/StringResource.xaml

@@ -6,13 +6,13 @@
         <ResourceDictionary Source="StringResource.H.xaml"/>
 
         <!--项目字符串-->
-        <ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/App.xaml

@@ -12,7 +12,7 @@
                 <ResourceDictionary Source="Themes/Styles.xaml"/>
                 <ResourceDictionary Source="Converters/Converters.xaml" />
 
-                <ResourceDictionary Source="Themes/StringResources/StringResource.xaml" />
+                <ResourceDictionary Source="Themes/StringResources/zh/StringResource.xaml" />
                 
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="GroupBox"/>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/FLY.Thick.Blowing.UI.Fix.Server.csproj

@@ -158,11 +158,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMain.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMain.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Themes/StringResources/StringResource.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Themes/StringResources/zh/StringResource.xaml

@@ -6,6 +6,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--项目报警项 字符串-->
-    <ResourceDictionary x:Key="dict.StringResource.ERRNO" Source="pack://application:,,,/FLY.Thick.Base;component/Themes/StringResources/StringResource.ERRNO.xaml" />
+    <ResourceDictionary x:Key="dict.StringResource.ERRNO" 
+                        Source="pack://application:,,,/FLY.Thick.Base;component/Themes/StringResources/zh/StringResource.ERRNO.xaml" />
 
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/App.xaml

@@ -14,7 +14,7 @@
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
 
                 <!--项目字符串-->
-                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/StringResource.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
 
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="GroupBox" />

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/FLY.Thick.Blowing.UI.csproj

@@ -211,7 +211,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.DynArea.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -219,7 +219,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.FlyADIODefine.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.FlyADIODefine.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -227,7 +227,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Graph.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Graph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -235,7 +235,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Menu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -243,7 +243,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgBlowing.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgBlowing.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -251,7 +251,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgFlyAd.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgFlyAd.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -267,19 +267,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgScanWarning.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgScanWarning.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgProfile.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgProfile.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMenu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgFlyAd.xaml.cs

@@ -85,7 +85,6 @@ namespace FLY.Thick.Blowing.UI
             if (!WdPassword.Authorize("FlyAd"))
                 return;
 
-            flyAdService.HasCRC = false;
             flyAdService.Addr = this.EP.ToString();
 
             flyAdService.HardwareVersion = HardwareVersion;

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/App.xaml

@@ -12,7 +12,7 @@
                 <!--项目Style-->
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
 
-                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="GroupBox" />

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj

@@ -254,11 +254,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.H.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.H.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Themes/StringResources/StringResource.xaml → Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Themes/StringResources/zh/StringResource.xaml

@@ -6,14 +6,14 @@
         <ResourceDictionary Source="StringResource.H.xaml"/>
 
         <!--项目字符串-->
-        <ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/FLY.DownBlowing.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Themes/StringResources/StringResource.xaml

@@ -6,6 +6,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--项目报警项 字符串-->
-    <ResourceDictionary x:Key="dict.StringResource.ERRNO" Source="pack://application:,,,/FLY.Thick.Base;component/Themes/StringResources/StringResource.ERRNO.xaml" />
+    <ResourceDictionary x:Key="dict.StringResource.ERRNO" 
+                        Source="pack://application:,,,/FLY.Thick.Base;component/Themes/StringResources/zh/StringResource.ERRNO.xaml" />
 
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/App.xaml

@@ -14,7 +14,7 @@
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
 
                 <!--项目字符串-->
-                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/StringResource.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
                 
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="GroupBox" />

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/FLY.Thick.BlowingScan.UI.csproj

@@ -116,15 +116,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgBlowing.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgBlowing.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Menu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.DynArea.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -132,11 +132,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMenu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Client/App.xaml

@@ -13,7 +13,7 @@
                 <!--项目Style-->
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
 
-                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Cap.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Cap.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
                 
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="GroupBox" />

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Client/FLY.Thick.Cap.UI.Client.csproj

@@ -261,11 +261,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.H.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.H.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Client/Themes/StringResources/StringResource.xaml → Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Client/Themes/StringResources/zh/StringResource.xaml

@@ -6,16 +6,16 @@
         <ResourceDictionary Source="StringResource.H.xaml"/>
 
         <!--项目字符串-->
-        <ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Cap.UI;component/Themes/StringResources/StringResource.xaml"/>
-        
-        <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MultiLayout;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Cap.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
+
+        <ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/StringResources/zh/StringResource.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Server/App.xaml

@@ -7,7 +7,7 @@
                 <ResourceDictionary Source="Themes/Styles.xaml"/>
                 <ResourceDictionary Source="Converters/Converters.xaml"/>
 
-                <ResourceDictionary Source="Themes/StringResources/StringResource.xaml" />
+                <ResourceDictionary Source="Themes/StringResources/zh/StringResource.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Server/FLY.Thick.Cap.UI.Server.csproj

@@ -120,11 +120,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMain.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMain.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Server/Themes/StringResources/StringResource.xaml → Project.FLY.Thick.Cap/FLY.Thick.Cap.UI.Server/Themes/StringResources/zh/StringResource.xaml

@@ -6,9 +6,9 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--项目报警项 字符串-->
-    <ResourceDictionary x:Key="dict.StringResource.ERRNO" Source="pack://application:,,,/FLY.Thick.Base;component/Themes/StringResources/StringResource.ERRNO.xaml" >
+    <ResourceDictionary x:Key="dict.StringResource.ERRNO" Source="pack://application:,,,/FLY.Thick.Base;component/Themes/StringResources/zh/StringResource.ERRNO.xaml" >
         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Cap;component/Themes/StringResources/StringResource.ERRNO.xaml" />
+            <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Cap;component/Themes/StringResources/zh/StringResource.ERRNO.xaml" />
         </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.Thick.Cap/FLY.Thick.Cap.UI/FLY.Thick.Cap.UI.csproj

@@ -107,23 +107,23 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.DynArea.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Menu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgInitParam.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgInitParam.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMenu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Cap/FLY.Thick.Cap/FLY.Thick.Cap.csproj

@@ -130,7 +130,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.ERRNO.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.ERRNO.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Thick.Cap/FLY.Thick.Cap/Server/FlyAdService.cs

@@ -22,15 +22,6 @@ namespace FLY.Thick.Cap.Server
         const int MARKNO_PUSH_ACCESS = 2;
         #endregion
 
-        public bool HasCRC {
-            get {
-                return flyad.HasCRC;
-            }
-            set
-            {
-                flyad.HasCRC = value;
-            }
-        }
         public string Addr
         {
             get
@@ -198,6 +189,14 @@ namespace FLY.Thick.Cap.Server
             }
         }
 
+        /// <summary>
+        /// 保存参数
+        /// </summary>
+        public void Apply()
+        {
+            flyad.Save();
+        }
+
         /// <summary>
         /// 获取序列码
         /// </summary>
@@ -298,5 +297,7 @@ namespace FLY.Thick.Cap.Server
             };
             asyncDelegate(asyncContext, p);
         }
+
     }
+
 }

Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj

@@ -336,63 +336,63 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.FeederPanel.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.FeederPanel.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.FlowTable.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.FlowTable.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.FlowGraph.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.FlowGraph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.DynArea.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.MainGraph.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.MainGraph.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgReduce.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgReduce.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMixTable.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMixTable.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgRollMixTable.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgRollMixTable.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgHopper.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgHopper.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgScrew.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgScrew.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgIngredient.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgIngredient.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgMenu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.PgThickness.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.PgThickness.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.Menu.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\StringResources\StringResource.xaml">
+    <Page Include="Themes\StringResources\zh\StringResource.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Project.FLY.Weight/FLY.Weight.UI.Client/Themes/StringResources/en/StringResource.PgMenu.xaml

@@ -11,8 +11,8 @@
 <system:String x:Key="str.Weight.PgMenu.Thickness">Thickness</system:String>
 <system:String x:Key="str.Weight.PgMenu.Error">Alarms</system:String>
 <system:String x:Key="str.Weight.PgMenu.FlowTable">Flow Log</system:String>
-<system:String x:Key="str.Weight.PgMenu.MixTable">Dosing Log</system:String>
-<system:String x:Key="str.Weight.PgMenu.RollMixTable">Cumulative Log</system:String>
+<system:String x:Key="str.Weight.PgMenu.MixTable" xml:space="preserve"> Dosing&#10;Log</system:String>
+<system:String x:Key="str.Weight.PgMenu.RollMixTable" xml:space="preserve"> Cumu.&#10;Log</system:String>
 <system:String x:Key="str.Weight.PgMenu.Reduce">Exact.Dec</system:String>
 
 </ResourceDictionary>
\ No newline at end of file