go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Code Issues Releases Activity

fix wording

Browse Source
This commit is contained in:
Jesse Duffield
2020-02-16 09:49:00 +11:00
parent 0a69c1a02d
commit 0f0da9c32a
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/keybindings.go
View File

@ -462,7 +462,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Key: gui.getKey("commits.viewResetOptions"), Key: gui.getKey("commits.viewResetOptions"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCreateResetToUpstreamMenu, Handler: gui.handleCreateResetToUpstreamMenu,
Description: gui.Tr.SLocalize("resetToUpstream"), Description: gui.Tr.SLocalize("viewResetToUpstreamOptions"),
}, },
{ {
ViewName: "branches", ViewName: "branches",
@ -550,7 +550,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Key: gui.getKey("commits.viewResetOptions"), Key: gui.getKey("commits.viewResetOptions"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCreateResetToBranchMenu, Handler: gui.handleCreateResetToBranchMenu,
Description: gui.Tr.SLocalize("resetToThisBranch"), Description: gui.Tr.SLocalize("viewResetOptions"),
}, },
{ {
ViewName: "branches", ViewName: "branches",
@ -590,7 +590,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Key: gui.getKey("commits.viewResetOptions"), Key: gui.getKey("commits.viewResetOptions"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCreateResetToTagMenu, Handler: gui.handleCreateResetToTagMenu,
Description: gui.Tr.SLocalize("resetToThisTag"), Description: gui.Tr.SLocalize("viewResetOptions"),
}, },
{ {
ViewName: "branches", ViewName: "branches",
@ -618,7 +618,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Key: gui.getKey("commits.viewResetOptions"), Key: gui.getKey("commits.viewResetOptions"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCreateResetToRemoteBranchMenu, Handler: gui.handleCreateResetToRemoteBranchMenu,
Description: gui.Tr.SLocalize("resetToThisBranch"), Description: gui.Tr.SLocalize("viewResetOptions"),
}, },
{ {
ViewName: "branches", ViewName: "branches",

10
pkg/i18n/english.go
View File

@ -943,14 +943,8 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "IgnoreTrackedPrompt", ID: "IgnoreTrackedPrompt",
Other: "Are you sure you want to ignore a tracked file?", Other: "Are you sure you want to ignore a tracked file?",
}, &i18n.Message{ }, &i18n.Message{
ID: "resetToThisBranch", ID: "viewResetToUpstreamOptions",
Other: "reset to the HEAD of this branch", Other: "view upstream reset options",
}, &i18n.Message{
ID: "resetToThisTag",
Other: "reset to this tag",
}, &i18n.Message{
ID: "resetToUpstream",
Other: "reset to the HEAD of the upstream branch",
}, },
) )
} }