update cheatsheets

docs/keybindings/Keybindings_en.md

@@ -8,20 +8,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: switch to a recent repo
   <kbd>pgup</kbd>: scroll up main panel (fn+up/shift+k)
   <kbd>pgdown</kbd>: scroll down main panel (fn+down/shift+j)
-  <kbd>m</kbd>: view merge/rebase options
-  <kbd>ctrl+p</kbd>: view custom patch options
-  <kbd>R</kbd>: refresh
-  <kbd>?</kbd>: open menu
-  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
-  <kbd>_</kbd>: prev screen mode
-  <kbd>ctrl+s</kbd>: view filter-by-path options
-  <kbd>W</kbd>: open diff menu
-  <kbd>ctrl+e</kbd>: open diff menu
   <kbd>@</kbd>: open command log menu
-  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
   <kbd>:</kbd>: execute custom command
+  <kbd>ctrl+p</kbd>: view custom patch options
+  <kbd>m</kbd>: view merge/rebase options
+  <kbd>R</kbd>: refresh
+  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
+  <kbd>_</kbd>: prev screen mode
+  <kbd>?</kbd>: open menu
+  <kbd>ctrl+s</kbd>: view filter-by-path options
+  <kbd>W</kbd>: open diff menu
+  <kbd>ctrl+e</kbd>: open diff menu
+  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
   <kbd>z</kbd>: undo (via reflog) (experimental)
   <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
   <kbd>P</kbd>: push
@@ -56,6 +56,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>`</kbd>: toggle file tree view
 </pre>
 
+## Commit Message
+
+<pre>
+  <kbd>enter</kbd>: confirm
+  <kbd>esc</kbd>: close
+</pre>
+
 ## Commits
 
 <pre>
@@ -89,6 +96,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>enter</kbd>: view selected item's files
 </pre>
 
+## Confirmation Panel
+
+<pre>
+  <kbd>enter</kbd>: confirm
+  <kbd>esc</kbd>: close/cancel
+</pre>
+
 ## Files
 
 <pre>
@@ -197,6 +211,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>C</kbd>: commit changes using git editor
 </pre>
 
+## Menu
+
+<pre>
+  <kbd>enter</kbd>: execute
+  <kbd>esc</kbd>: close
+</pre>
+
 ## Reflog
 
 <pre>
@@ -250,8 +271,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Status
 
 <pre>
-  <kbd>e</kbd>: edit config file
   <kbd>o</kbd>: open config file
+  <kbd>e</kbd>: edit config file
   <kbd>u</kbd>: check for update
   <kbd>enter</kbd>: switch to a recent repo
   <kbd>a</kbd>: show all branch logs

docs/keybindings/Keybindings_ja.md

@@ -8,20 +8,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: 最近使用したリポジトリに切り替え
   <kbd>pgup</kbd>: メインパネルを上にスクロール (fn+up/shift+k)
   <kbd>pgdown</kbd>: メインパネルを下にスクロール (fn+down/shift+j)
-  <kbd>m</kbd>: view merge/rebase options
-  <kbd>ctrl+p</kbd>: view custom patch options
-  <kbd>R</kbd>: リフレッシュ
-  <kbd>?</kbd>: メニューを開く
-  <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen)
-  <kbd>_</kbd>: 前のスクリーンモード
-  <kbd>ctrl+s</kbd>: view filter-by-path options
-  <kbd>W</kbd>: 差分メニューを開く
-  <kbd>ctrl+e</kbd>: 差分メニューを開く
   <kbd>@</kbd>: コマンドログメニューを開く
-  <kbd>ctrl+w</kbd>: 空白文字の差分の表示有無を切り替え
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
   <kbd>:</kbd>: カスタムコマンドを実行
+  <kbd>ctrl+p</kbd>: view custom patch options
+  <kbd>m</kbd>: view merge/rebase options
+  <kbd>R</kbd>: リフレッシュ
+  <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen)
+  <kbd>_</kbd>: 前のスクリーンモード
+  <kbd>?</kbd>: メニューを開く
+  <kbd>ctrl+s</kbd>: view filter-by-path options
+  <kbd>W</kbd>: 差分メニューを開く
+  <kbd>ctrl+e</kbd>: 差分メニューを開く
+  <kbd>ctrl+w</kbd>: 空白文字の差分の表示有無を切り替え
   <kbd>z</kbd>: アンドゥ (via reflog) (experimental)
   <kbd>ctrl+z</kbd>: リドゥ (via reflog) (experimental)
   <kbd>P</kbd>: push
@@ -115,6 +115,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>`</kbd>: ファイルツリーの表示を切り替え
 </pre>
 
+## コミットメッセージ
+
+<pre>
+  <kbd>enter</kbd>: 確認
+  <kbd>esc</kbd>: 閉じる
+</pre>
+
 ## サブモジュール
 
 <pre>
@@ -131,8 +138,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## ステータス
 
 <pre>
-  <kbd>e</kbd>: 設定ファイルを編集
   <kbd>o</kbd>: 設定ファイルを開く
+  <kbd>e</kbd>: 設定ファイルを編集
   <kbd>u</kbd>: 更新を確認
   <kbd>enter</kbd>: 最近使用したリポジトリに切り替え
   <kbd>a</kbd>: すべてのブランチログを表示
@@ -257,6 +264,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>C</kbd>: gitエディタを使用して変更をコミット
 </pre>
 
+## メニュー
+
+<pre>
+  <kbd>enter</kbd>: 実行
+  <kbd>esc</kbd>: 閉じる
+</pre>
+
 ## リモート
 
 <pre>
@@ -295,3 +309,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
   <kbd>enter</kbd>: コミットを閲覧
 </pre>
+
+## 確認パネル
+
+<pre>
+  <kbd>enter</kbd>: 確認
+  <kbd>esc</kbd>: 閉じる/キャンセル
+</pre>

docs/keybindings/Keybindings_ko.md

@@ -8,20 +8,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: 최근에 사용한 저장소로 전환
   <kbd>pgup</kbd>: 메인 패널을 위로 스크롤 (fn+up/shift+k)
   <kbd>pgdown</kbd>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j)
-  <kbd>m</kbd>: view merge/rebase options
-  <kbd>ctrl+p</kbd>: 커스텀 Patch 옵션 보기
-  <kbd>R</kbd>: 새로고침
-  <kbd>?</kbd>: 매뉴 열기
-  <kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen)
-  <kbd>_</kbd>: 이전 스크린 모드
-  <kbd>ctrl+s</kbd>: view filter-by-path options
-  <kbd>W</kbd>: Diff 메뉴 열기
-  <kbd>ctrl+e</kbd>: Diff 메뉴 열기
   <kbd>@</kbd>: 명령어 로그 메뉴 열기
-  <kbd>ctrl+w</kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환
   <kbd>}</kbd>: diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기
   <kbd>{</kbd>: diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기
   <kbd>:</kbd>: execute custom command
+  <kbd>ctrl+p</kbd>: 커스텀 Patch 옵션 보기
+  <kbd>m</kbd>: view merge/rebase options
+  <kbd>R</kbd>: 새로고침
+  <kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen)
+  <kbd>_</kbd>: 이전 스크린 모드
+  <kbd>?</kbd>: 매뉴 열기
+  <kbd>ctrl+s</kbd>: view filter-by-path options
+  <kbd>W</kbd>: Diff 메뉴 열기
+  <kbd>ctrl+e</kbd>: Diff 메뉴 열기
+  <kbd>ctrl+w</kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환
   <kbd>z</kbd>: 되돌리기 (reflog) (실험적)
   <kbd>ctrl+z</kbd>: 다시 실행 (reflog) (실험적)
   <kbd>P</kbd>: 푸시
@@ -83,6 +83,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>enter</kbd>: view selected item's files
 </pre>
 
+## 메뉴
+
+<pre>
+  <kbd>enter</kbd>: 실행
+  <kbd>esc</kbd>: 닫기
+</pre>
+
 ## 메인 패널 (Merging)
 
 <pre>
@@ -168,8 +175,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 상태
 
 <pre>
-  <kbd>e</kbd>: 설정 파일 수정
   <kbd>o</kbd>: 설정 파일 열기
+  <kbd>e</kbd>: 설정 파일 수정
   <kbd>u</kbd>: 업데이트 확인
   <kbd>enter</kbd>: 최근에 사용한 저장소로 전환
   <kbd>a</kbd>: 모든 브랜치 로그 표시
@@ -259,6 +266,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>`</kbd>: 파일 트리뷰로 전환
 </pre>
 
+## 커밋메시지
+
+<pre>
+  <kbd>enter</kbd>: 확인
+  <kbd>esc</kbd>: 닫기
+</pre>
+
 ## 태그
 
 <pre>
@@ -295,3 +309,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>M</kbd>: git mergetool를 열기
   <kbd>f</kbd>: fetch
 </pre>
+
+## 확인 패널
+
+<pre>
+  <kbd>enter</kbd>: 확인
+  <kbd>esc</kbd>: 닫기/취소
+</pre>

docs/keybindings/Keybindings_nl.md

@@ -8,20 +8,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: wissel naar een recente repo
   <kbd>pgup</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
   <kbd>pgdown</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
-  <kbd>m</kbd>: bekijk merge/rebase opties
-  <kbd>ctrl+p</kbd>: bekijk aangepaste patch opties
-  <kbd>R</kbd>: verversen
-  <kbd>?</kbd>: open menu
-  <kbd>+</kbd>: volgende scherm modus (normaal/half/groot)
-  <kbd>_</kbd>: vorige scherm modus
-  <kbd>ctrl+s</kbd>: bekijk scoping opties
-  <kbd>W</kbd>: open diff menu
-  <kbd>ctrl+e</kbd>: open diff menu
   <kbd>@</kbd>: open command log menu
-  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
   <kbd>:</kbd>: voer aangepaste commando uit
+  <kbd>ctrl+p</kbd>: bekijk aangepaste patch opties
+  <kbd>m</kbd>: bekijk merge/rebase opties
+  <kbd>R</kbd>: verversen
+  <kbd>+</kbd>: volgende scherm modus (normaal/half/groot)
+  <kbd>_</kbd>: vorige scherm modus
+  <kbd>?</kbd>: open menu
+  <kbd>ctrl+s</kbd>: bekijk scoping opties
+  <kbd>W</kbd>: open diff menu
+  <kbd>ctrl+e</kbd>: open diff menu
+  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
   <kbd>z</kbd>: ongedaan maken (via reflog) (experimenteel)
   <kbd>ctrl+z</kbd>: redo (via reflog) (experimenteel)
   <kbd>P</kbd>: push
@@ -68,6 +68,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>f</kbd>: fetch
 </pre>
 
+## Bevestigingspaneel
+
+<pre>
+  <kbd>enter</kbd>: bevestig
+  <kbd>esc</kbd>: sluiten
+</pre>
+
 ## Branches
 
 <pre>
@@ -91,6 +98,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>enter</kbd>: bekijk commits
 </pre>
 
+## Commit Bericht
+
+<pre>
+  <kbd>enter</kbd>: bevestig
+  <kbd>esc</kbd>: sluiten
+</pre>
+
 ## Commit bestanden
 
 <pre>
@@ -138,6 +152,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>enter</kbd>: bekijk gecommite bestanden
 </pre>
 
+## Menu
+
+<pre>
+  <kbd>enter</kbd>: uitvoeren
+  <kbd>esc</kbd>: sluiten
+</pre>
+
 ## Mergen
 
 <pre>
@@ -250,8 +271,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Status
 
 <pre>
-  <kbd>e</kbd>: verander config bestand
   <kbd>o</kbd>: open config bestand
+  <kbd>e</kbd>: verander config bestand
   <kbd>u</kbd>: check voor updates
   <kbd>enter</kbd>: wissel naar een recente repo
   <kbd>a</kbd>: alle logs van de branch laten zien

docs/keybindings/Keybindings_pl.md

@@ -8,20 +8,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: switch to a recent repo
   <kbd>pgup</kbd>: scroll up main panel (fn+up/shift+k)
   <kbd>pgdown</kbd>: scroll down main panel (fn+down/shift+j)
-  <kbd>m</kbd>: widok scalenia/opcje zmiany bazy
-  <kbd>ctrl+p</kbd>: view custom patch options
-  <kbd>R</kbd>: odśwież
-  <kbd>?</kbd>: open menu
-  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
-  <kbd>_</kbd>: prev screen mode
-  <kbd>ctrl+s</kbd>: view filter-by-path options
-  <kbd>W</kbd>: open diff menu
-  <kbd>ctrl+e</kbd>: open diff menu
   <kbd>@</kbd>: open command log menu
-  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
   <kbd>:</kbd>: wykonaj własną komendę
+  <kbd>ctrl+p</kbd>: view custom patch options
+  <kbd>m</kbd>: widok scalenia/opcje zmiany bazy
+  <kbd>R</kbd>: odśwież
+  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
+  <kbd>_</kbd>: prev screen mode
+  <kbd>?</kbd>: open menu
+  <kbd>ctrl+s</kbd>: view filter-by-path options
+  <kbd>W</kbd>: open diff menu
+  <kbd>ctrl+e</kbd>: open diff menu
+  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
   <kbd>z</kbd>: undo (via reflog) (experimental)
   <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
   <kbd>P</kbd>: push
@@ -42,6 +42,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>[</kbd>: previous tab
 </pre>
 
+## Commit Message
+
+<pre>
+  <kbd>enter</kbd>: potwierdź
+  <kbd>esc</kbd>: zamknij
+</pre>
+
 ## Commity
 
 <pre>
@@ -75,6 +82,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>enter</kbd>: przeglądaj pliki commita
 </pre>
 
+## Confirmation Panel
+
+<pre>
+  <kbd>enter</kbd>: potwierdź
+  <kbd>esc</kbd>: zamknij
+</pre>
+
 ## Local Branches
 
 <pre>
@@ -113,6 +127,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>esc</kbd>: wyście z trybu "linia po linii"
 </pre>
 
+## Menu
+
+<pre>
+  <kbd>enter</kbd>: wykonaj
+  <kbd>esc</kbd>: zamknij
+</pre>
+
 ## Pliki
 
 <pre>
@@ -243,8 +264,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Status
 
 <pre>
-  <kbd>e</kbd>: edytuj konfigurację
   <kbd>o</kbd>: otwórz konfigurację
+  <kbd>e</kbd>: edytuj konfigurację
   <kbd>u</kbd>: sprawdź aktualizacje
   <kbd>enter</kbd>: switch to a recent repo
   <kbd>a</kbd>: pokaż wszystkie logi gałęzi

docs/keybindings/Keybindings_zh.md

@@ -8,20 +8,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+r</kbd>: 切换到最近的仓库
   <kbd>pgup</kbd>: 向上滚动主面板 (fn+up/shift+k)
   <kbd>pgdown</kbd>: 向下滚动主面板 (fn+down/shift+j)
-  <kbd>m</kbd>: 查看 合并/变基 选项
-  <kbd>ctrl+p</kbd>: 查看自定义补丁选项
-  <kbd>R</kbd>: 刷新
-  <kbd>?</kbd>: 打开菜单
-  <kbd>+</kbd>: 下一屏模式（正常/半屏/全屏）
-  <kbd>_</kbd>: 上一屏模式
-  <kbd>ctrl+s</kbd>: 查看按路径过滤选项
-  <kbd>W</kbd>: 打开 diff 菜单
-  <kbd>ctrl+e</kbd>: 打开 diff 菜单
   <kbd>@</kbd>: 打开命令日志菜单
-  <kbd>ctrl+w</kbd>: 切换是否在差异视图中显示空白字符差异
   <kbd>}</kbd>: 扩大差异视图中显示的上下文范围
   <kbd>{</kbd>: 缩小差异视图中显示的上下文范围
   <kbd>:</kbd>: 执行自定义命令
+  <kbd>ctrl+p</kbd>: 查看自定义补丁选项
+  <kbd>m</kbd>: 查看 合并/变基 选项
+  <kbd>R</kbd>: 刷新
+  <kbd>+</kbd>: 下一屏模式（正常/半屏/全屏）
+  <kbd>_</kbd>: 上一屏模式
+  <kbd>?</kbd>: 打开菜单
+  <kbd>ctrl+s</kbd>: 查看按路径过滤选项
+  <kbd>W</kbd>: 打开 diff 菜单
+  <kbd>ctrl+e</kbd>: 打开 diff 菜单
+  <kbd>ctrl+w</kbd>: 切换是否在差异视图中显示空白字符差异
   <kbd>z</kbd>: （通过 reflog）撤销「实验功能」
   <kbd>ctrl+z</kbd>: （通过 reflog）重做「实验功能」
   <kbd>P</kbd>: 推送
@@ -155,6 +155,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>`</kbd>: 切换文件树视图
 </pre>
 
+## 提交讯息
+
+<pre>
+  <kbd>enter</kbd>: 确认
+  <kbd>esc</kbd>: 关闭
+</pre>
+
 ## 文件
 
 <pre>
@@ -254,13 +261,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 状态
 
 <pre>
-  <kbd>e</kbd>: 编辑配置文件
   <kbd>o</kbd>: 打开配置文件
+  <kbd>e</kbd>: 编辑配置文件
   <kbd>u</kbd>: 检查更新
   <kbd>enter</kbd>: 切换到最近的仓库
   <kbd>a</kbd>: 显示所有分支的日志
 </pre>
 
+## 确认面板
+
+<pre>
+  <kbd>enter</kbd>: 确认
+  <kbd>esc</kbd>: 关闭
+</pre>
+
+## 菜单
+
+<pre>
+  <kbd>enter</kbd>: 执行
+  <kbd>esc</kbd>: 关闭
+</pre>
+
 ## 贮藏
 
 <pre>

pkg/gui/keybindings.go

@@ -52,6 +52,7 @@ func (self *Gui) GetCheatsheetKeybindings() []*types.Binding {
 	self.helpers = helpers.NewStubHelpers()
 	self.State = &GuiRepoState{}
 	self.State.Contexts = self.contextTree()
+	self.State.ContextMgr = NewContextMgr(nil, self, self.State.Contexts)
 	self.resetControllers()
 	bindings, _ := self.GetInitialKeybindings()
 	return bindings