Merge pull request !20 from Jai/fix/crash-I45EWV

This commit is contained in:
leo 2021-08-13 08:11:16 +00:00 committed by Gitee
commit 1845fbbbc8
2 changed files with 8 additions and 0 deletions

View file

@ -162,6 +162,10 @@
<sys:String x:Key="Text.GitFlow.DevSameAsProd">Development branch is same with production!</sys:String> <sys:String x:Key="Text.GitFlow.DevSameAsProd">Development branch is same with production!</sys:String>
<sys:String x:Key="Text.GitFlow.KeepBranchAfterFinish">Keep branch</sys:String> <sys:String x:Key="Text.GitFlow.KeepBranchAfterFinish">Keep branch</sys:String>
<sys:String x:Key="Text.RepoCM.Bookmark">Bookmark</sys:String>
<sys:String x:Key="Text.RepoCM.Open">Open</sys:String>
<sys:String x:Key="Text.RepoCM.Explore">Open Container Folder</sys:String>
<sys:String x:Key="Text.BranchCM.Push">Push '{0}'</sys:String> <sys:String x:Key="Text.BranchCM.Push">Push '{0}'</sys:String>
<sys:String x:Key="Text.BranchCM.DiscardAll">Discard all changes</sys:String> <sys:String x:Key="Text.BranchCM.DiscardAll">Discard all changes</sys:String>
<sys:String x:Key="Text.BranchCM.FastForward">Fast-Forward to '{0}'</sys:String> <sys:String x:Key="Text.BranchCM.FastForward">Fast-Forward to '{0}'</sys:String>

View file

@ -161,6 +161,10 @@
<sys:String x:Key="Text.GitFlow.DevSameAsProd">开发分支与发布分支不可相同!</sys:String> <sys:String x:Key="Text.GitFlow.DevSameAsProd">开发分支与发布分支不可相同!</sys:String>
<sys:String x:Key="Text.GitFlow.KeepBranchAfterFinish">保留分支</sys:String> <sys:String x:Key="Text.GitFlow.KeepBranchAfterFinish">保留分支</sys:String>
<sys:String x:Key="Text.RepoCM.Bookmark">书签</sys:String>
<sys:String x:Key="Text.RepoCM.Open">打开</sys:String>
<sys:String x:Key="Text.RepoCM.Explore">在浏览器中查看</sys:String>
<sys:String x:Key="Text.BranchCM.Push">推送 '{0}'</sys:String> <sys:String x:Key="Text.BranchCM.Push">推送 '{0}'</sys:String>
<sys:String x:Key="Text.BranchCM.DiscardAll">放弃所有更改</sys:String> <sys:String x:Key="Text.BranchCM.DiscardAll">放弃所有更改</sys:String>
<sys:String x:Key="Text.BranchCM.FastForward">快进到 '{0}'</sys:String> <sys:String x:Key="Text.BranchCM.FastForward">快进到 '{0}'</sys:String>