diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 10:05:39 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 10:21:53 +1000 |
| commit | 9f4433d8b55e1878610fd06d39ffd3ffaa623e79 (patch) | |
| tree | 602370b2f03da4004ee77948170f1db2a0aaa40b /pkg/i18n | |
| parent | 2d8f7d2a7b9efa2767a4ec00878c8027e267d045 (diff) | |
allow opening merge tool
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 91aa18eb8..3b9ce3377 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -48,6 +48,7 @@ type TranslationSet struct { LcToggleStaged string LcToggleStagedAll string LcToggleTreeView string + LcOpenMergeTool string LcRefresh string LcPush string LcPull string @@ -156,6 +157,8 @@ type TranslationSet struct { CouldNotFindBinaryErr string AnonymousReportingTitle string AnonymousReportingPrompt string + MergeToolTitle string + MergeToolPrompt string IntroPopupMessage string GitconfigParseErr string LcEditFile string @@ -683,6 +686,7 @@ func englishTranslationSet() TranslationSet { LcToggleStaged: "toggle staged", LcToggleStagedAll: "stage/unstage all", LcToggleTreeView: "toggle file tree view", + LcOpenMergeTool: "open external merge tool (git mergetool)", LcRefresh: "refresh", LcPush: "push", LcPull: "pull", @@ -791,6 +795,8 @@ func englishTranslationSet() TranslationSet { CouldNotFindBinaryErr: "Could not find any binary at {{.url}}", AnonymousReportingTitle: "Help make lazygit better", AnonymousReportingPrompt: "Would you like to enable anonymous reporting data to help improve lazygit? (enter/esc)", + MergeToolTitle: "Merge tool", + MergeToolPrompt: "Are you sure you want to open `git mergetool`?", IntroPopupMessage: englishIntroPopupMessage, GitconfigParseErr: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`, LcEditFile: `edit file`, |