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.

6 files changed, 7 insertions, 10 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:                "您目前既不进行变基也不进行合并",
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 0be8cd2aa..bd0a15b8e 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -140,8 +140,7 @@ func dutchTranslationSet() TranslationSet {
 		ReturnToFilesPanel:                  `Ga terug naar het bestanden paneel`,
 		FastForward:                         `Fast-forward deze branch vanaf zijn upstream`,
 		Fetching:                            "Fetching en fast-forwarding {{.from}} -> {{.to}} ...",
-		FoundConflicts:                      "Conflicten!, Om af te breken druk 'esc', anders druk op 'enter'",
-		FoundConflictsTitle:                 "Auto-merge mislukt",
+		FoundConflictsTitle:                 "Conflicten!",
 		ViewMergeRebaseOptions:              "Bekijk merge/rebase opties",
 		NotMergingOrRebasing:                "Je bent momenteel niet aan het rebasen of mergen",
 		RecentRepos:                         "Recente repositories",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 2a954d57d..22a00b91c 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -181,8 +181,9 @@ type TranslationSet struct {
 	ReturnToFilesPanel                  string
 	FastForward                         string
 	Fetching                            string
-	FoundConflicts                      string
 	FoundConflictsTitle                 string
+	ViewConflictsMenuItem               string
+	AbortMenuItem                       string
 	PickHunk                            string
 	PickAllHunks                        string
 	ViewMergeRebaseOptions              string
@@ -867,8 +868,9 @@ func EnglishTranslationSet() TranslationSet {
 		ReturnToFilesPanel:                  `Return to files panel`,
 		FastForward:                         `Fast-forward this branch from its upstream`,
 		Fetching:                            "Fetching and fast-forwarding {{.from}} -> {{.to}} ...",
-		FoundConflicts:                      "Conflicts! To abort press 'esc', otherwise press 'enter'",
-		FoundConflictsTitle:                 "Auto-merge failed",
+		FoundConflictsTitle:                 "Conflicts!",
+		ViewConflictsMenuItem:               "View conflicts",
+		AbortMenuItem:                       "Abort the %s",
 		ViewMergeRebaseOptions:              "View merge/rebase options",
 		NotMergingOrRebasing:                "You are currently neither rebasing nor merging",
 		AlreadyRebasing:                     "Can't perform this action during a rebase",
diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go
index 0f0a1f2c2..1c469ed68 100644
--- a/pkg/i18n/korean.go
+++ b/pkg/i18n/korean.go
@@ -176,7 +176,6 @@ func koreanTranslationSet() TranslationSet {
 		ReturnToFilesPanel:                  `파일 목록으로 돌아가기`,
 		FastForward:                         `Fast-forward this branch from its upstream`,
 		Fetching:                            "Fetching and fast-forwarding {{.from}} -> {{.to}} ...",
-		FoundConflicts:                      "Conflicts! To abort press 'esc', otherwise press 'enter'",
 		FoundConflictsTitle:                 "Auto-merge failed",
 		ViewMergeRebaseOptions:              "View merge/rebase options",
 		NotMergingOrRebasing:                "You are currently neither rebasing nor merging",
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index 729902cb4..5ac6b8a3a 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -125,8 +125,7 @@ func polishTranslationSet() TranslationSet {
 		MoveUpCommit:                        "Przenieś commit 1 w górę",
 		EditCommit:                          "Edytuj commit",
 		AmendToCommit:                       "Popraw commit zmianami z poczekalni",
-		FoundConflicts:                      "Konflikty! Wciśnij 'esc' żeby przerwać, w przeciwnym razie wciśnij 'enter'",
-		FoundConflictsTitle:                 "Automatyczne scalenie nie powiodło się",
+		FoundConflictsTitle:                 "Konflikty!",
 		ViewMergeRebaseOptions:              "Widok scalenia/opcje zmiany bazy",
 		NotMergingOrRebasing:                "W tej chwili nie scalasz ani nie zmieniasz bazy",
 		RecentRepos:                         "Ostatnie repozytoria",
diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go
index c9f036cb9..c51ae97b1 100644
--- a/pkg/i18n/traditional_chinese.go
+++ b/pkg/i18n/traditional_chinese.go
@@ -240,7 +240,6 @@ func traditionalChineseTranslationSet() TranslationSet {
 		ReturnToFilesPanel:                  `返回檔案面板`,
 		FastForward:                         `從上游快進此分支`,
 		Fetching:                            "{{.from}} -> {{.to}} 的擷取和快進中...",
-		FoundConflicts:                      "衝突！按 'esc' 退出，否則按 'enter'",
 		FoundConflictsTitle:                 "自動合併失敗",
 		ViewMergeRebaseOptions:              "查看合併/變基選項",
 		NotMergingOrRebasing:                "你當前既不在變基也不在合併中",