diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 49a9802a38e..af97c610238 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -349,7 +349,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | Merge | Merge selected branch into currently checked out branch. | +| `` M `` | Merge | Merge selected tag into currently checked out branch | | `` `` | View commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 8a91f2353a8..f6481432f11 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -183,7 +183,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. | +| `` M `` | 現在のブランチにマージ | Merge selected tag into currently checked out branch | | `` `` | コミットを閲覧 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index 08ef52a3014..273b8bd8320 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -322,7 +322,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. | +| `` M `` | 현재 브랜치에 병합 | Merge selected tag into currently checked out branch | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 1b0d579e8d8..c97c1279c97 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -349,7 +349,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. | +| `` M `` | Merge in met huidige checked out branch | Merge selected tag into currently checked out branch | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 12155178859..82df9670a1c 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -330,8 +330,8 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita, | `` n `` | Nowy tag | Utwórz nowy tag z bieżącego commita. Zostaniesz poproszony o wprowadzenie nazwy tagu i opcjonalnego opisu. | | `` d `` | Usuń | Wyświetl opcje usuwania lokalnego/odległego tagu. | | `` P `` | Wyślij tag | Wyślij wybrany tag do zdalnego. Zostaniesz poproszony o wybranie zdalnego. | -| `` M `` | Scal do obecnej gałęzi | Merge selected branch into currently checked out branch. | | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. | +| `` M `` | Scal | Merge selected tag into currently checked out branch | | `` `` | Pokaż commity | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md index bb0e17b47fc..ec75dd23b56 100644 --- a/docs/keybindings/Keybindings_ru.md +++ b/docs/keybindings/Keybindings_ru.md @@ -288,7 +288,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | Отправить тег | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. | +| `` M `` | Слияние с текущей переключённой веткой | Merge selected tag into currently checked out branch | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md index 7c1aac446a3..d1036e97c0b 100644 --- a/docs/keybindings/Keybindings_zh-CN.md +++ b/docs/keybindings/Keybindings_zh-CN.md @@ -248,7 +248,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | 推送标签 | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. | +| `` M `` | 合并到当前检出的分支 | Merge selected tag into currently checked out branch | | `` `` | 查看提交 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md index 60511cf3508..8bc0553c81c 100644 --- a/docs/keybindings/Keybindings_zh-TW.md +++ b/docs/keybindings/Keybindings_zh-TW.md @@ -284,7 +284,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Delete | View delete options for local/remote tag. | | `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. | +| `` M `` | 合併到當前檢出的分支 | Merge selected tag into currently checked out branch | | `` `` | 檢視提交 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index d9f4e2663d6..a1e905984e5 100644 --- 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 index 77e2432ad62..6db2fd20afe 100644 --- 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`,