Show "Close/Cancel: <esc>" for menus like we do for confirmations

For many menus, just "Close" is fine, but some menus act more like confirmations
(e.g. the menu that appears when you cherry-pick and get conflicts); in this
case, it's good to make it more obvious that hitting esc cancels the whole
thing.

Author: stefanhaller

docs/keybindings/Keybindings_en.md

@@ -256,7 +256,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | Execute |  |
-| `` <esc> `` | Close |  |
+| `` <esc> `` | Close/Cancel |  |
 | `` / `` | Filter the current view by text |  |
 
 ## Reflog

docs/keybindings/Keybindings_ja.md

@@ -302,7 +302,7 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | 実行 |  |
-| `` <esc> `` | 閉じる |  |
+| `` <esc> `` | 閉じる/キャンセル |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |
 
 ## リフログ

docs/keybindings/Keybindings_ko.md

@@ -128,7 +128,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | 실행 |  |
-| `` <esc> `` | 닫기 |  |
+| `` <esc> `` | 닫기/취소 |  |
 | `` / `` | Filter the current view by text |  |
 
 ## 메인 패널 (Merging)

docs/keybindings/Keybindings_pl.md

@@ -159,7 +159,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | Wykonaj |  |
-| `` <esc> `` | Zamknij |  |
+| `` <esc> `` | Zamknij/Anuluj |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |
 
 ## Panel główny (normalny)

docs/keybindings/Keybindings_pt.md

@@ -221,7 +221,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | Executar |  |
-| `` <esc> `` | Fechar |  |
+| `` <esc> `` | Fechar/Cancelar |  |
 | `` / `` | Filter the current view by text |  |
 
 ## Painel Principal (Normal)

docs/keybindings/Keybindings_ru.md

@@ -227,7 +227,7 @@ _Связки клавиш_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | Выполнить |  |
-| `` <esc> `` | Закрыть |  |
+| `` <esc> `` | Закрыть/отменить |  |
 | `` / `` | Filter the current view by text |  |
 
 ## Панель Подтверждения

docs/keybindings/Keybindings_zh-TW.md

@@ -119,7 +119,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <enter> `` | 執行 |  |
-| `` <esc> `` | 關閉 |  |
+| `` <esc> `` | 關閉/取消 |  |
 | `` / `` | 搜尋 |  |
 
 ## 子提交

pkg/gui/controllers/menu_controller.go

@@ -47,7 +47,7 @@ func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types.
 		{
 			Key:             opts.GetKey(opts.Config.Universal.Return),
 			Handler:         self.close,
-			Description:     self.c.Tr.Close,
+			Description:     self.c.Tr.CloseCancel,
 			DisplayOnScreen: true,
 		},
 	}