diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-02-16 09:49:00 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-02-16 09:57:49 +1100 |
| commit | 0f0da9c32a0a8ced0f88128e091452ba0478eea9 (patch) | |
| tree | 4b77ad71ab4350af38677d291e58d4874f016242 | |
| parent | 0a69c1a02d2981a45f79fa65f785ef962be566aa (diff) | |
fix wording
| -rw-r--r-- | pkg/gui/keybindings.go | 8 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 2df06fd86..14d8e1297 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -462,7 +462,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Key: gui.getKey("commits.viewResetOptions"), Modifier: gocui.ModNone, Handler: gui.handleCreateResetToUpstreamMenu, - Description: gui.Tr.SLocalize("resetToUpstream"), + Description: gui.Tr.SLocalize("viewResetToUpstreamOptions"), }, { ViewName: "branches", @@ -550,7 +550,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Key: gui.getKey("commits.viewResetOptions"), Modifier: gocui.ModNone, Handler: gui.handleCreateResetToBranchMenu, - Description: gui.Tr.SLocalize("resetToThisBranch"), + Description: gui.Tr.SLocalize("viewResetOptions"), }, { ViewName: "branches", @@ -590,7 +590,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Key: gui.getKey("commits.viewResetOptions"), Modifier: gocui.ModNone, Handler: gui.handleCreateResetToTagMenu, - Description: gui.Tr.SLocalize("resetToThisTag"), + Description: gui.Tr.SLocalize("viewResetOptions"), }, { ViewName: "branches", @@ -618,7 +618,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Key: gui.getKey("commits.viewResetOptions"), Modifier: gocui.ModNone, Handler: gui.handleCreateResetToRemoteBranchMenu, - Description: gui.Tr.SLocalize("resetToThisBranch"), + Description: gui.Tr.SLocalize("viewResetOptions"), }, { ViewName: "branches", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 325896bf7..b60e914db 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -943,14 +943,8 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "IgnoreTrackedPrompt", Other: "Are you sure you want to ignore a tracked file?", }, &i18n.Message{ - ID: "resetToThisBranch", - Other: "reset to the HEAD of this branch", - }, &i18n.Message{ - ID: "resetToThisTag", - Other: "reset to this tag", - }, &i18n.Message{ - ID: "resetToUpstream", - Other: "reset to the HEAD of the upstream branch", + ID: "viewResetToUpstreamOptions", + Other: "view upstream reset options", }, ) } |