dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-01 09:24:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feature<Histories>: add reword/squash context menu for HEAD commit

Browse source
This commit is contained in:
leo 2021-08-05 20:38:38 +08:00
parent 76f192785c
commit 59fa5304d8
9 changed files with 279 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Resources/Locales/en_US.xaml
View file

@ -196,6 +196,8 @@
<sys:String x:Key="Text.CommitCM.InteractiveRebase">Interactive Rebase '{0}' from Here</sys:String>
<sys:String x:Key="Text.CommitCM.Rebase">Rebase '{0}' to Here</sys:String>
<sys:String x:Key="Text.CommitCM.CherryPick">Cherry-Pick This Commit</sys:String>
<sys:String x:Key="Text.CommitCM.Reword">Reword</sys:String>
<sys:String x:Key="Text.CommitCM.Squash">Squash Into Parent</sys:String>
<sys:String x:Key="Text.CommitCM.Revert">Revert Commit</sys:String>
<sys:String x:Key="Text.CommitCM.SaveAsPatch">Save as Patch ...</sys:String>
<sys:String x:Key="Text.CommitCM.CopySHA">Copy Commit SHA</sys:String>
@ -466,6 +468,15 @@
<sys:String x:Key="Text.Hotkeys.Refresh">Reload current repository if possible</sys:String>
<sys:String x:Key="Text.Hotkeys.ToggleStage">Stage or unstage selected files</sys:String>
<sys:String x:Key="Text.Reword">Reword Commit Message</sys:String>
<sys:String x:Key="Text.Reword.On">On :</sys:String>
<sys:String x:Key="Text.Reword.Message">Message :</sys:String>
<sys:String x:Key="Text.Squash">Squash HEAD Into Parent</sys:String>
<sys:String x:Key="Text.Squash.Head">HEAD :</sys:String>
<sys:String x:Key="Text.Squash.To">To :</sys:String>
<sys:String x:Key="Text.Squash.Message">Reword :</sys:String>
<sys:String x:Key="Text.NotConfigured">Git has NOT been configured. Please to go [Preference] and configure it first.</sys:String>
<sys:String x:Key="Text.PathNotFound">Path[{0}] not exists!</sys:String>
<sys:String x:Key="Text.MissingBash">Can NOT locate bash.exe. Make sure bash.exe exists under the same folder with git.exe</sys:String>
@ -486,7 +497,7 @@
<sys:String x:Key="Text.EmptyTagName">Tag name can NOT be null</sys:String>
<sys:String x:Key="Text.BadTagName">Bad name for tag. Regex: ^[\\w\\-\\.]+$</sys:String>
<sys:String x:Key="Text.DuplicatedTagName">Duplicated tag name!</sys:String>
<sys:String x:Key="Text.EmptyCommitMessage">Commit subject can NOT be empty</sys:String>
<sys:String x:Key="Text.EmptyCommitMessage">Commit message can NOT be empty</sys:String>
<sys:String x:Key="Text.BadPatchFile">Invalid path for patch file</sys:String>
<sys:String x:Key="Text.BadRelativePath">Invalid relative path</sys:String>
<sys:String x:Key="Text.BadArchiveFile">Invalid path for archive file</sys:String>

11
src/Resources/Locales/zh_CN.xaml
View file

@ -195,6 +195,8 @@
<sys:String x:Key="Text.CommitCM.InteractiveRebase">从此处开始对 '{0}' 交互式变基</sys:String>
<sys:String x:Key="Text.CommitCM.Rebase">变基 '{0}' 到此处</sys:String>
<sys:String x:Key="Text.CommitCM.CherryPick">挑选此提交</sys:String>
<sys:String x:Key="Text.CommitCM.Reword">编辑提交信息</sys:String>
<sys:String x:Key="Text.CommitCM.Squash">合并此提交到上一个提交</sys:String>
<sys:String x:Key="Text.CommitCM.Revert">回滚此提交</sys:String>
<sys:String x:Key="Text.CommitCM.SaveAsPatch">另存为补丁 ...</sys:String>
<sys:String x:Key="Text.CommitCM.CopySHA">复制提交指纹</sys:String>
@ -465,6 +467,15 @@
<sys:String x:Key="Text.Hotkeys.Refresh">重新加载当前仓库信息（仅在仓库页起效）</sys:String>
<sys:String x:Key="Text.Hotkeys.ToggleStage">暂存或从暂存中移除当前选中</sys:String>
<sys:String x:Key="Text.Reword">编辑提交信息</sys:String>
<sys:String x:Key="Text.Reword.On">提交：</sys:String>
<sys:String x:Key="Text.Reword.Message">提交信息：</sys:String>
<sys:String x:Key="Text.Squash">合并HEAD到上一个提交</sys:String>
<sys:String x:Key="Text.Squash.Head">当前提交 :</sys:String>
<sys:String x:Key="Text.Squash.To">合并到 :</sys:String>
<sys:String x:Key="Text.Squash.Message">修改提交信息：</sys:String>
<sys:String x:Key="Text.NotConfigured">GIT尚未配置。请打开【偏好设置】配置GIT路径。</sys:String>
<sys:String x:Key="Text.PathNotFound">路径（{0}）不存在或不可读取!</sys:String>
<sys:String x:Key="Text.MissingBash">无法找到bash.exe，请确保其在git.exe同目录中！</sys:String>