diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index ab1a8684268..918c80289f7 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -123,7 +123,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Confirm | | -| `` `` | Close/Cancel | | +| `` `` | Close | | ## Files diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index ec536b302f3..7460f152e50 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -400,4 +400,4 @@ _凡例:`<c-b>` はctrl+b、`<a-b>` はalt+b、`B` はshift+bを意味 | Key | Action | Info | |-----|--------|-------------| | `` `` | 確認 | | -| `` `` | 閉じる/キャンセル | | +| `` `` | 閉じる | | diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index de2c6c71964..09eeb53f58c 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -400,4 +400,4 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | 확인 | | -| `` `` | 닫기/취소 | | +| `` `` | 닫기 | | diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 311194a0f76..c6f27bbbc9e 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -215,7 +215,7 @@ _Legenda: `` oznacza ctrl+b, `` oznacza alt+b, `B` oznacza shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Potwierdź | | -| `` `` | Zamknij/Anuluj | | +| `` `` | Zamknij | | ## Pliki diff --git a/docs/keybindings/Keybindings_pt.md b/docs/keybindings/Keybindings_pt.md index 096be874dc1..0d256d8b390 100644 --- a/docs/keybindings/Keybindings_pt.md +++ b/docs/keybindings/Keybindings_pt.md @@ -198,7 +198,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Confirmar | | -| `` `` | Fechar/Cancelar | | +| `` `` | Fechar | | ## Etiquetas diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md index 48af4b35f76..f513fce78c1 100644 --- a/docs/keybindings/Keybindings_ru.md +++ b/docs/keybindings/Keybindings_ru.md @@ -235,7 +235,7 @@ _Связки клавиш_ | Key | Action | Info | |-----|--------|-------------| | `` `` | Подтвердить | | -| `` `` | Закрыть/отменить | | +| `` `` | Закрыть | | ## Подкоммиты diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md index 5f980089ba6..0510811b5f7 100644 --- a/docs/keybindings/Keybindings_zh-TW.md +++ b/docs/keybindings/Keybindings_zh-TW.md @@ -370,7 +370,7 @@ _說明:`` 表示 Ctrl+B、`` 表示 Alt+B,`B`表示 Shift+B | Key | Action | Info | |-----|--------|-------------| | `` `` | 確認 | | -| `` `` | 關閉/取消 | | +| `` `` | 關閉 | | ## 遠端 diff --git a/pkg/gui/controllers/confirmation_controller.go b/pkg/gui/controllers/confirmation_controller.go index 97754655fa0..41ef55fca6b 100644 --- a/pkg/gui/controllers/confirmation_controller.go +++ b/pkg/gui/controllers/confirmation_controller.go @@ -35,7 +35,7 @@ func (self *ConfirmationController) GetKeybindings(opts types.KeybindingsOpts) [ { Key: opts.GetKey(opts.Config.Universal.Return), Handler: func() error { return self.context().State.OnClose() }, - Description: self.c.Tr.CloseCancel, + Description: self.c.Tr.Close, DisplayOnScreen: true, }, { diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 3a8823b8b77..54f4739c83e 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -161,7 +161,6 @@ type TranslationSet struct { NoBranchesThisRepo string CommitWithoutMessageErr string Close string - CloseCancel string Confirm string Quit string SquashTooltip string @@ -1218,7 +1217,6 @@ func EnglishTranslationSet() *TranslationSet { NoBranchesThisRepo: "No branches for this repo", CommitWithoutMessageErr: "You cannot commit without a commit message", Close: "Close", - CloseCancel: "Close/Cancel", Confirm: "Confirm", Quit: "Quit", SquashTooltip: "Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it.",