dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-28 15:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: ux for in progress action (cherry-pick/rebase/revert/merge)

Browse source
This commit is contained in:
leo 2024-04-01 21:27:08 +08:00
parent 814af539cd
commit 53bcafa5ed
7 changed files with 243 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/SourceGit/Resources/Locales.en.resx
View file

@ -1161,9 +1161,6 @@
<data xml:space="preserve" name="Text.WorkingCopy.IncludeUntracked">
<value>INCLUDE UNTRACKED FILES</value>
</data>
<data xml:space="preserve" name="Text.Conflict.Tip">
<value>Conflict detected! Press 'Abort' to restore original HEAD.</value>
</data>
<data xml:space="preserve" name="Text.ClearStashes">
<value>Clear Stashes</value>
</data>
@ -1338,4 +1335,16 @@
<data name="Text.About.SourceCode" xml:space="preserve">
<value>• Source code can be found at </value>
</data>
<data name="Text.InProgress.CherryPick" xml:space="preserve">
<value>Cherry-Pick in progress. Press 'Abort' to restore original HEAD.</value>
</data>
<data name="Text.InProgress.Rebase" xml:space="preserve">
<value>Rebase in progress. Press 'Abort' to restore original HEAD.</value>
</data>
<data name="Text.InProgress.Revert" xml:space="preserve">
<value>Revert in progress. Press 'Abort' to restore original HEAD.</value>
</data>
<data name="Text.InProgress.Merge" xml:space="preserve">
<value>Merge request in progress. Press 'Abort' to restore original HEAD.</value>
</data>
</root>