Add dedicated tooltip for tag merge

jesseduffield · Apr 8, 2024 · e4cef84 · e4cef84
1 parent 2568944
commit e4cef84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
@@ -78,7 +78,7 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
  Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
  Handler: opts.Guards.OutsideFilterMode(self.withItem(self.merge)),
  Description: self.c.Tr.Merge,
- Tooltip: self.c.Tr.MergeBranchTooltip,
+ Tooltip: self.c.Tr.MergeTagTooltip,
  DisplayOnScreen: true,
  },
  }

diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -227,6 +227,7 @@ type TranslationSet struct {
  RefreshFiles string
  Merge string
  MergeBranchTooltip string
+ MergeTagTooltip string
  ConfirmQuit string
  SwitchRepo string
  AllBranchesLogGraph string
@@ -1188,6 +1189,7 @@ func EnglishTranslationSet() TranslationSet {
  RefreshFiles: `Refresh files`,
  Merge: `Merge`,
  MergeBranchTooltip: "Merge selected branch into currently checked out branch.",
+ MergeTagTooltip: "Merge selected tag into currently checked out branch",
  ConfirmQuit: `Are you sure you want to quit?`,
  SwitchRepo: `Switch to a recent repo`,
  AllBranchesLogGraph: `Show all branch logs`,