Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

FastReport/Localization/readme.txt

@@ -0,0 +1 @@
+Want to create localization for your language? Please drop an email to tz@fast-report.com.

MainWindow.xaml

@@ -26,7 +26,6 @@
                 <MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/>
                 <MenuItem Header="_转换设置" FontSize="16" Name="_EXCHANGE_SET" IsEnabled="False"/>
                 <MenuItem Header="_打印设置" FontSize="16" Name="_PRINT_SET" Click="PRINT_SET" IsEnabled="False"/>
-                <MenuItem Header="_用户设置" FontSize="16" Name="_USER_SET" Click="USER_SET" IsEnabled="False"/>
                 <MenuItem Header="_登录限制" FontSize="16" Name="_USER_log" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_管理" FontSize="16" Focusable ="False">
@@ -42,6 +41,8 @@
                 <MenuItem Header="_布种" FontSize="16" Name="_fabric" Click="fabric" IsEnabled="False"/>
                 <MenuItem Header="_颜色名" FontSize="16" Name="_color" Click="color" IsEnabled="False"/>
                 <MenuItem Header="_客户" FontSize="16" Name="_client" Click="client" IsEnabled="False"/>
+                <Separator />
+                <MenuItem Header="_用户设置" FontSize="16" Name="_USER_SET" Click="USER_SET" IsEnabled="False"/>
             </MenuItem>
             <MenuItem Header="_查询" FontSize="16" Focusable ="False">
                 <MenuItem Header="_领料单据" FontSize="16"/>

formula_manage.csproj

@@ -428,6 +428,33 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="FastReport\Localization\Arabic.frl" />
+    <None Include="FastReport\Localization\Armenian.frl" />
+    <None Include="FastReport\Localization\Chinese %28Simplified%29.frl" />
+    <None Include="FastReport\Localization\Chinese %28Traditional%29.frl" />
+    <None Include="FastReport\Localization\Croatian.frl" />
+    <None Include="FastReport\Localization\Czech.frl" />
+    <None Include="FastReport\Localization\Danish.frl" />
+    <None Include="FastReport\Localization\Dutch.frl" />
+    <None Include="FastReport\Localization\French.frl" />
+    <None Include="FastReport\Localization\German.frl" />
+    <None Include="FastReport\Localization\Greek.frl" />
+    <None Include="FastReport\Localization\Hungarian.frl" />
+    <None Include="FastReport\Localization\Italian.frl" />
+    <None Include="FastReport\Localization\Persian.frl" />
+    <None Include="FastReport\Localization\Polish.frl" />
+    <None Include="FastReport\Localization\Portuguese %28Brazil%29.frl" />
+    <None Include="FastReport\Localization\Portuguese.frl" />
+    <None Include="FastReport\Localization\Romanian.frl" />
+    <None Include="FastReport\Localization\Russian.frl" />
+    <None Include="FastReport\Localization\Serbian.frl" />
+    <None Include="FastReport\Localization\Slovak.frl" />
+    <None Include="FastReport\Localization\Slovenian.frl" />
+    <None Include="FastReport\Localization\Spanish.frl" />
+    <None Include="FastReport\Localization\Swedish.frl" />
+    <None Include="FastReport\Localization\Thai.frl" />
+    <None Include="FastReport\Localization\Turkish.frl" />
+    <None Include="FastReport\Localization\Ukrainian.frl" />
     <None Include="formula_manage_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -468,6 +495,9 @@
   <ItemGroup>
     <Resource Include="sunlight_logo.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="FastReport\Localization\readme.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>