go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-27 12:32:37 +02:00
Code Issues Releases Activity

fix copy for merge confirmation

Browse Source
This commit is contained in:
Jesse Duffield 2022-03-27 17:29:22 +11:00
parent e011acbab2
commit 860d1e0145
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -246,7 +246,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e
) )
return self.c.Ask(types.AskOpts{ return self.c.Ask(types.AskOpts{
Title: self.c.Tr.MergingTitle, Title: self.c.Tr.MergeConfirmTitle,
Prompt: prompt, Prompt: prompt,
HandleConfirm: func() error { HandleConfirm: func() error {
self.c.LogAction(self.c.Tr.Actions.Merge) self.c.LogAction(self.c.Tr.Actions.Merge)

2
pkg/i18n/english.go
View File

@ -22,6 +22,7 @@ type TranslationSet struct {
MainTitle string MainTitle string
StagingTitle string StagingTitle string
MergingTitle string MergingTitle string
MergeConfirmTitle string
NormalTitle string NormalTitle string
CommitMessage string CommitMessage string
CredentialsUsername string CredentialsUsername string
@ -610,6 +611,7 @@ func EnglishTranslationSet() TranslationSet {
UnstagedChanges: `Unstaged Changes`, UnstagedChanges: `Unstaged Changes`,
StagedChanges: `Staged Changes`, StagedChanges: `Staged Changes`,
MainTitle: "Main", MainTitle: "Main",
MergeConfirmTitle: "Merge",
StagingTitle: "Main Panel (Staging)", StagingTitle: "Main Panel (Staging)",
MergingTitle: "Main Panel (Merging)", MergingTitle: "Main Panel (Merging)",
NormalTitle: "Main Panel (Normal)", NormalTitle: "Main Panel (Normal)",