diff options
| author | Ryooooooga <eial5q265e5@gmail.com> | 2021-08-24 21:38:34 +0900 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-08-25 22:23:55 +1000 |
| commit | df4eb70ba287f972177b87c54cc025a6073184ea (patch) | |
| tree | b9ff5f2f655292dc5a73fa2790f05f92e82265de /pkg/gui/keybindings.go | |
| parent | 6ca42ff72081624fc05be571d75ab71dd1d9bf6b (diff) | |
Fix translations
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index a74f3c68c..0280d6fd1 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -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", |