Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

Properties/Resources.Designer.cs

@@ -303,6 +303,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Quit 的本地化字符串。
+        /// </summary>
+        public static string Quit {
+            get {
+                return ResourceManager.GetString("Quit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Ready 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -246,4 +246,7 @@
   <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Quit</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -246,4 +246,7 @@
   <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Quit</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -246,4 +246,7 @@
   <data name="Save" xml:space="preserve">
     <value>保存</value>
   </data>
+  <data name="Quit" xml:space="preserve">
+    <value>退出</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -246,4 +246,7 @@
   <data name="Save" xml:space="preserve">
     <value>儲存</value>
   </data>
+  <data name="Quit" xml:space="preserve">
+    <value>退出</value>
+  </data>
 </root>

View/ProgramstepsView .xaml

@@ -14,7 +14,7 @@
     <Grid>
         <Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Height="40"/>
         <Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_edit_Click"/>
-        <Button Content="{x:Static lang:Resources.Recover}" x:Name="ProgramgroupView_Recover" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Recover_Click"/>
+        <Button Content="{x:Static lang:Resources.Quit}" x:Name="ProgramgroupView_Quit" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Quit_Click"/>
         <Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="800,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_del_Click"/>
         <Button Content="{x:Static lang:Resources.Insert}" x:Name="ProgramgroupView_Insert" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Insert_Click"/>
         <Button Content="{x:Static lang:Resources.Save}" x:Name="ProgramgroupView_Save" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Save_Click"/>

View/ProgramstepsView .xaml.cs

@@ -78,7 +78,7 @@ namespace DyeingComputer.View
         {
 
         }
-        private void ProgramgroupView_Recover_Click(object sender, RoutedEventArgs e)//
+        private void ProgramgroupView_Quit_Click(object sender, RoutedEventArgs e)//
         {
 
         }