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/merge_panel.go | |
| parent | 6ca42ff72081624fc05be571d75ab71dd1d9bf6b (diff) | |
Fix translations
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index ae3019da3..9fcd475c8 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -95,7 +95,7 @@ func (gui *Gui) handlePickHunk() error { }) } -func (gui *Gui) handlePickBothHunks() error { +func (gui *Gui) handlePickAllHunks() error { return gui.withMergeConflictLock(func() error { gui.takeOverMergeConflictScrolling() @@ -233,7 +233,7 @@ func (gui *Gui) getMergingOptions() map[string]string { fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevItem), gui.getKeyDisplay(keybindingConfig.Universal.NextItem)): gui.Tr.LcSelectHunk, fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevBlock), gui.getKeyDisplay(keybindingConfig.Universal.NextBlock)): gui.Tr.LcNavigateConflicts, gui.getKeyDisplay(keybindingConfig.Universal.Select): gui.Tr.LcPickHunk, - gui.getKeyDisplay(keybindingConfig.Main.PickBothHunks): gui.Tr.LcPickBothHunks, + gui.getKeyDisplay(keybindingConfig.Main.PickBothHunks): gui.Tr.LcPickAllHunks, gui.getKeyDisplay(keybindingConfig.Universal.Undo): gui.Tr.LcUndo, } } |