diff options
| author | Mark Kopenga <mkopenga@gmail.com> | 2018-08-15 10:53:05 +0200 |
|---|---|---|
| committer | Mark Kopenga <mkopenga@gmail.com> | 2018-08-15 10:53:05 +0200 |
| commit | 7e926cf41da55461fbd02d2a4ce4e3c2318db0a8 (patch) | |
| tree | 3d98df1c4960a97b4d9659f27fc62dd3717c0283 /pkg/gui/merge_panel.go | |
| parent | d12cc5a74e770ed99f4cc57bf3f4f9d34c499181 (diff) | |
Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.go
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 81e37f593..213bac739 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -232,11 +232,11 @@ func (gui *Gui) switchToMerging(g *gocui.Gui) error { func (gui *Gui) renderMergeOptions(g *gocui.Gui) error { return gui.renderOptionsMap(g, map[string]string{ - "↑ ↓": "select hunk", - "← →": "navigate conflicts", - "space": "pick hunk", - "b": "pick both hunks", - "z": "undo", + "↑ ↓": gui.Tr.SLocalize("selectHunk", "select hunk"), + "← →": gui.Tr.SLocalize("navigateConflicts", "navigate conflicts"), + "space": gui.Tr.SLocalize("pickHunk", "pick hunk"), + "b": gui.Tr.SLocalize("pickBothHunks", "pick both hunks"), + "z": gui.Tr.SLocalize("undo", "undo"), }) } |