1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

Fix translations

This commit is contained in:
Ryooooooga
2021-08-24 21:38:34 +09:00
committed by Jesse Duffield
parent 6ca42ff720
commit df4eb70ba2
8 changed files with 32 additions and 32 deletions

View File

@ -1464,8 +1464,8 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
ViewName: "main",
Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)},
Key: gui.getKey(config.Main.PickBothHunks),
Handler: gui.handlePickBothHunks,
Description: gui.Tr.PickBothHunks,
Handler: gui.handlePickAllHunks,
Description: gui.Tr.PickAllHunks,
},
{
ViewName: "main",
@ -1486,14 +1486,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.PrevItem),
Handler: gui.handleSelectPrevConflictHunk,
Description: gui.Tr.SelectTop,
Description: gui.Tr.SelectPrevHunk,
},
{
ViewName: "main",
Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.NextItem),
Handler: gui.handleSelectNextConflictHunk,
Description: gui.Tr.SelectBottom,
Description: gui.Tr.SelectNextHunk,
},
{
ViewName: "main",