diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-06-05 16:39:59 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-06-05 22:15:51 +1000 |
| commit | fb395bca6eedfc44afb04ad26005a45e7b7dfea9 (patch) | |
| tree | 4669caf828ea97afdb9c829820ff53c5731fcca2 /pkg/i18n | |
| parent | f91adf026bfbddc9505d6d84d3fabc80d49c7ca0 (diff) | |
support reverting merge commits
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 1fac1b322..317572b81 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -449,6 +449,7 @@ type TranslationSet struct { FocusCommandLog string CommandLogHeader string RandomTip string + SelectParentCommitForMerge string Spans Spans } @@ -991,6 +992,7 @@ func englishTranslationSet() TranslationSet { FocusCommandLog: "Focus command log", CommandLogHeader: "You can hide/focus this panel by pressing '%s' or hide it permanently in your config with `gui.showCommandLog: false`\n", RandomTip: "Random Tip", + SelectParentCommitForMerge: "Select parent commit for merge", Spans: Spans{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "Checkout commit", |