diff options
Diffstat (limited to 'pkg/i18n/english.go')
| -rw-r--r-- | pkg/i18n/english.go | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 7f22e82bd..4e2a6a094 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -181,9 +181,6 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "FileNoMergeCons", Other: "This file has no inline merge conflicts", }, &i18n.Message{ - ID: "SureResetHardHead", - Other: "Are you sure you want to `reset --hard HEAD` and `clean -fd`? You may lose changes", - }, &i18n.Message{ ID: "SoftReset", Other: "Soft reset", }, &i18n.Message{ @@ -406,9 +403,6 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "NoChangedFiles", Other: "No changed files", }, &i18n.Message{ - ID: "ClearFilePanel", - Other: "Clear file panel", - }, &i18n.Message{ ID: "MergeAborted", Other: "Merge aborted", }, &i18n.Message{ @@ -717,6 +711,18 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "discardUnstagedChanges", Other: "discard unstaged changes", + }, &i18n.Message{ + ID: "discardAllChangesToAllFiles", + Other: "nuke working tree", + }, &i18n.Message{ + ID: "discardAnyUnstagedChanges", + Other: "discard unstaged changes", + }, &i18n.Message{ + ID: "discardUntrackedFiles", + Other: "discard untracked files", + }, &i18n.Message{ + ID: "hardReset", + Other: "hard reset", }, ) } |