summaryrefslogtreecommitdiffstats
path: root/pkg/i18n/english.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/i18n/english.go')
-rw-r--r--pkg/i18n/english.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 5f03881a6..db3cd112c 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -507,6 +507,7 @@ type Actions struct {
DiscardAllChangesInFile string
DiscardAllUnstagedChangesInFile string
StageFile string
+ StageResolvedFiles string
UnstageFile string
UnstageAllFiles string
StageAllFiles string
@@ -1064,6 +1065,7 @@ func EnglishTranslationSet() TranslationSet {
DiscardAllChangesInFile: "Discard all changes in file",
DiscardAllUnstagedChangesInFile: "Discard all unstaged changes in file",
StageFile: "Stage file",
+ StageResolvedFiles: "Stage files whose merge conflicts were resolved",
UnstageFile: "Unstage file",
UnstageAllFiles: "Unstage all files",
StageAllFiles: "Stage all files",