mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge c7bdf92619 into 223978eb82

Browse source
This commit is contained in:
Versha Dhankar 2025-05-05 18:54:46 +00:00 • committed by GitHub
commit aca62a37fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
docs/keybindings/Keybindings_en.md
View file

@ -190,7 +190,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Main panel (merging)
@ -261,7 +261,7 @@ Note that this disregards the selection, the new branch is always created either
|-----|--------|-------------|
| `` <enter> `` | Execute | |
| `` <esc> `` | Close | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Reflog
@ -283,7 +283,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Remote branches
@ -302,7 +302,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Remotes
@ -313,7 +313,7 @@ Note that this disregards the selection, the new branch is always created either
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Edit | Edit the selected remote's name or URL. |
| `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Secondary
@ -335,7 +335,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | View files | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Status
@ -381,7 +381,7 @@ Note that this disregards the selection, the new branch is always created either
| `` e `` | Update submodule URL | |
| `` i `` | Initialize | Initialize the selected submodule to prepare for fetching. You probably want to follow this up by invoking the 'update' action to fetch the submodule. |
| `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Tags
@ -397,7 +397,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Worktrees
@ -407,4 +407,4 @@ Note that this disregards the selection, the new branch is always created either
| `` <space> `` | Switch | Switch to the selected worktree. |
| `` o `` | Open in editor | |
| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |

18
docs/keybindings/Keybindings_ja.md
View file

@ -71,7 +71,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` 0 `` | Focus main view | |
| `` <enter> `` | View files | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Sub-commits
@ -103,7 +103,7 @@ Note that this disregards the selection, the new branch is always created either
| `` <space> `` | Switch | Switch to the selected worktree. |
| `` o `` | Open in editor | |
| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## コミット
@ -187,7 +187,7 @@ Note that this disregards the selection, the new branch is always created either
| `` e `` | サブモジュールのURLを更新 | |
| `` i `` | Initialize | サブモジュールを初期化 |
| `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## ステータス
@ -213,7 +213,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## ファイル
@ -277,7 +277,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## メインパネル (Merging)
@ -348,7 +348,7 @@ Note that this disregards the selection, the new branch is always created either
|-----|--------|-------------|
| `` <enter> `` | 実行 | |
| `` <esc> `` | 閉じる | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## リモート
@ -359,7 +359,7 @@ Note that this disregards the selection, the new branch is always created either
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | 編集 | リモートを編集 |
| `` f `` | Fetch | リモートをfetch |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## リモートブランチ
@ -378,7 +378,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 参照ログ
@ -400,7 +400,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 確認パネル

18
docs/keybindings/Keybindings_ko.md
View file

@ -71,7 +71,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Secondary
@ -93,7 +93,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | View selected item's files | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Sub-commits
@ -125,7 +125,7 @@ Note that this disregards the selection, the new branch is always created either
| `` <space> `` | Switch | Switch to the selected worktree. |
| `` o `` | Open in editor | |
| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 메뉴
@ -133,7 +133,7 @@ Note that this disregards the selection, the new branch is always created either
|-----|--------|-------------|
| `` <enter> `` | 실행 | |
| `` <esc> `` | 닫기 | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 메인 패널 (Merging)
@ -227,7 +227,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 상태
@ -251,7 +251,7 @@ Note that this disregards the selection, the new branch is always created either
| `` e `` | 서브모듈의 URL을 수정 | |
| `` i `` | Initialize | 서브모듈 초기화 |
| `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 원격
@ -262,7 +262,7 @@ Note that this disregards the selection, the new branch is always created either
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Edit | Remote를 수정 |
| `` f `` | Fetch | 원격을 업데이트 |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 원격 브랜치
@ -281,7 +281,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 커밋
@ -367,7 +367,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## 파일

18
docs/keybindings/Keybindings_nl.md
View file

@ -120,7 +120,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Commit bericht
@ -198,7 +198,7 @@ Note that this disregards the selection, the new branch is always created either
|-----|--------|-------------|
| `` <enter> `` | Uitvoeren | |
| `` <esc> `` | Sluiten | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Mergen
@ -261,7 +261,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Remote branches
@ -280,7 +280,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Remotes
@ -291,7 +291,7 @@ Note that this disregards the selection, the new branch is always created either
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Edit | Wijzig remote |
| `` f `` | Fetch | Fetch remote |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Secondary
@ -335,7 +335,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Bekijk gecommite bestanden | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Status
@ -381,7 +381,7 @@ Note that this disregards the selection, the new branch is always created either
| `` e `` | Update submodule URL | |
| `` i `` | Initialize | Initialiseer submodule |
| `` b `` | Bekijk bulk submodule opties | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Tags
@ -397,7 +397,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Worktrees
@ -407,4 +407,4 @@ Note that this disregards the selection, the new branch is always created either
| `` <space> `` | Switch | Switch to the selected worktree. |
| `` o `` | Open in editor | |
| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |

18
docs/keybindings/Keybindings_ru.md
View file

@ -59,7 +59,7 @@ _Связки клавиш_
| `` <space> `` | Switch | Switch to the selected worktree. |
| `` o `` | Open in editor | |
| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Вторичный
@ -152,7 +152,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Коммиты
@ -226,7 +226,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Меню
@ -234,7 +234,7 @@ Note that this disregards the selection, the new branch is always created either
|-----|--------|-------------|
| `` <enter> `` | Выполнить | |
| `` <esc> `` | Закрыть | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Панель Подтверждения
@ -277,7 +277,7 @@ Note that this disregards the selection, the new branch is always created either
| `` e `` | Обновить URL подмодуля | |
| `` i `` | Initialize | Инициализировать подмодуль |
| `` b `` | Просмотреть параметры массового подмодуля | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Сводка коммита
@ -330,7 +330,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Удалённые ветки
@ -349,7 +349,7 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Удалённые репозитории
@ -360,7 +360,7 @@ Note that this disregards the selection, the new branch is always created either
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Edit | Редактировать удалённый репозитории |
| `` f `` | Получить изменения | Получение изменения из удалённого репозитория |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |
## Файлы
@ -407,4 +407,4 @@ Note that this disregards the selection, the new branch is always created either
| `` 0 `` | Focus main view | |
| `` <enter> `` | Просмотреть файлы выбранного элемента | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | |
| `` / `` | Filter | |

7
pkg/gui/controllers/filter_controller.go
View file

@ -36,9 +36,10 @@ func (self *FilterController) Context() types.Context {
func (self *FilterController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
return []*types.Binding{
{
Key: opts.GetKey(opts.Config.Universal.StartSearch),
Handler: self.OpenFilterPrompt,
Description: self.c.Tr.StartFilter,
Key: opts.GetKey(opts.Config.Universal.StartSearch),
Handler: self.OpenFilterPrompt,
Description: self.c.Tr.StartFilter,
DisplayOnScreen: true,
},
}
}

2
pkg/i18n/english.go
View file

@ -1685,7 +1685,7 @@ func EnglishTranslationSet() *TranslationSet {
NextScreenMode: "Next screen mode (normal/half/fullscreen)",
PrevScreenMode: "Prev screen mode",
StartSearch: "Search the current view by text",
StartFilter: "Filter the current view by text",
StartFilter: "Filter",
Panel: "Panel",
KeybindingsLegend: "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
RenameBranch: "Rename branch",