diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-27 17:29:22 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-27 18:16:16 +1100 |
| commit | 860d1e0145dbf33f4f9662a0d0013e347112c5ea (patch) | |
| tree | 3f011230803890513ad25cadf826e160b3e96428 | |
| parent | e011acbab2952c8f58406a79651f4873d57a2de4 (diff) | |
fix copy for merge confirmation
| -rw-r--r-- | pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 2 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index 73d2c160d..9b45ca1a9 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -246,7 +246,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e ) return self.c.Ask(types.AskOpts{ - Title: self.c.Tr.MergingTitle, + Title: self.c.Tr.MergeConfirmTitle, Prompt: prompt, HandleConfirm: func() error { self.c.LogAction(self.c.Tr.Actions.Merge) diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 220203437..3bef51e8b 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -22,6 +22,7 @@ type TranslationSet struct { MainTitle string StagingTitle string MergingTitle string + MergeConfirmTitle string NormalTitle string CommitMessage string CredentialsUsername string @@ -610,6 +611,7 @@ func EnglishTranslationSet() TranslationSet { UnstagedChanges: `Unstaged Changes`, StagedChanges: `Staged Changes`, MainTitle: "Main", + MergeConfirmTitle: "Merge", StagingTitle: "Main Panel (Staging)", MergingTitle: "Main Panel (Merging)", NormalTitle: "Main Panel (Normal)", |