diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-05-31 18:29:01 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-06-01 10:51:48 +0200 |
| commit | 16dceb813baa6a2db14ffc46eef9204f4ddb09d3 (patch) | |
| tree | 4237852bb1063e50108a6e454929223b7ce03539 /pkg/i18n/chinese.go | |
| parent | c70c8e84f85a5ce98c02b305a6dc4ea6a9eb6be8 (diff) | |
Show menu instead of prompt when there are conflicts in a rebase or merge
This solves the issue that previously you could too easily abort a rebase
accidentally by hitting escape.
Diffstat (limited to 'pkg/i18n/chinese.go')
| -rw-r--r-- | pkg/i18n/chinese.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 835201762..52e92559f 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -175,7 +175,6 @@ func chineseTranslationSet() TranslationSet { ReturnToFilesPanel: `返回文件面板`, FastForward: `从上游快进此分支`, Fetching: "抓取并快进 {{.from}} -> {{.to}} ...", - FoundConflicts: "冲突！需要中止操作请按‘esc’, 否则按‘enter’", FoundConflictsTitle: "自动合并失败", ViewMergeRebaseOptions: "查看 合并/变基 选项", NotMergingOrRebasing: "您目前既不进行变基也不进行合并", |