Merge pull request #2453 from stefanhaller/allow-rebasing-to-first-commit

6 files changed, 8 insertions, 22 deletions

diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go
index 9533f0239..dbc8122e9 100644
--- a/pkg/i18n/chinese.go
+++ b/pkg/i18n/chinese.go
@@ -102,7 +102,7 @@ func chineseTranslationSet() TranslationSet {
 		LcSquashDown:                        "向下压缩",
 		LcFixupCommit:                       "修正提交（fixup）",
 		NoCommitsThisBranch:                 "该分支没有提交",
-		YouNoCommitsToSquash:                "您没有提交可以压缩",
+		CannotSquashOrFixupFirstCommit:      "There's no commit below to squash into",
 		Fixup:                               "修正（fixup）",
 		SureFixupThisCommit:                 "您确定要“修正”此提交吗？它将合并到下面的提交中",
 		SureSquashThisCommit:                "您确定要将这个提交压缩到下面的提交中吗？",
@@ -216,8 +216,6 @@ func chineseTranslationSet() TranslationSet {
 		LcPasteCommits:                      "粘贴提交（拣选）",
 		SureCherryPick:                      "您确定要将选中的提交进行拣选到这个分支吗？",
 		CherryPick:                          "拣选 (Cherry-Pick)",
-		CannotRebaseOntoFirstCommit:         "您不能以交互方式变基 (rebase) 至第一次提交",
-		CannotSquashOntoSecondCommit:        "您不能压缩 (squash) 或修正 (fixup) 第二个提交",
 		Donate:                              "捐助",
 		AskQuestion:                         "提问咨询",
 		PrevLine:                            "选择上一行",
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 0127c07ad..d8fcb5338 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -67,7 +67,7 @@ func dutchTranslationSet() TranslationSet {
 		LcQuit:                              "quit",
 		LcSquashDown:                        "squash beneden",
 		LcFixupCommit:                       "Fixup commit",
-		YouNoCommitsToSquash:                "Je hebt geen commits om mee te squashen",
+		CannotSquashOrFixupFirstCommit:      "There's no commit below to squash into",
 		Fixup:                               "Fixup",
 		SureFixupThisCommit:                 "Weet je zeker dat je fixup wil uitvoeren op deze commit? De commit hieronder zol worden squashed in deze",
 		SureSquashThisCommit:                "Weet je zeker dat je deze commit wil samenvoegen met de commit hieronder?",
@@ -181,8 +181,6 @@ func dutchTranslationSet() TranslationSet {
 		LcPasteCommits:                      "plak commits (cherry-pick)",
 		SureCherryPick:                      "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?",
 		CherryPick:                          "Cherry-Pick",
-		CannotRebaseOntoFirstCommit:         "Je kan niet interactief rebasen naar de eerste commit",
-		CannotSquashOntoSecondCommit:        "Je kan niet een squash/fixup doen naar de 2de commit",
 		Donate:                              "Doneer",
 		PrevLine:                            "selecteer de vorige lijn",
 		NextLine:                            "selecteer de volgende lijn",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 808e7af86..775a4c4bf 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -87,7 +87,7 @@ type TranslationSet struct {
 	LcQuit                              string
 	LcSquashDown                        string
 	LcFixupCommit                       string
-	YouNoCommitsToSquash                string
+	CannotSquashOrFixupFirstCommit      string
 	Fixup                               string
 	SureFixupThisCommit                 string
 	SureSquashThisCommit                string
@@ -219,8 +219,6 @@ type TranslationSet struct {
 	LcPasteCommits                      string
 	SureCherryPick                      string
 	CherryPick                          string
-	CannotRebaseOntoFirstCommit         string
-	CannotSquashOntoSecondCommit        string
 	Donate                              string
 	AskQuestion                         string
 	PrevLine                            string
@@ -737,7 +735,7 @@ func EnglishTranslationSet() TranslationSet {
 		LcSquashDown:                        "squash down",
 		LcFixupCommit:                       "fixup commit",
 		NoCommitsThisBranch:                 "No commits for this branch",
-		YouNoCommitsToSquash:                "You have no commits to squash with",
+		CannotSquashOrFixupFirstCommit:      "There's no commit below to squash into",
 		Fixup:                               "Fixup",
 		SureFixupThisCommit:                 "Are you sure you want to 'fixup' this commit? It will be merged into the commit below",
 		SureSquashThisCommit:                "Are you sure you want to squash this commit into the commit below?",
@@ -869,8 +867,6 @@ func EnglishTranslationSet() TranslationSet {
 		LcPasteCommits:                      "paste commits (cherry-pick)",
 		SureCherryPick:                      "Are you sure you want to cherry-pick the copied commits onto this branch?",
 		CherryPick:                          "Cherry-Pick",
-		CannotRebaseOntoFirstCommit:         "You cannot interactive rebase onto the first commit",
-		CannotSquashOntoSecondCommit:        "You cannot squash/fixup onto the second commit",
 		Donate:                              "Donate",
 		AskQuestion:                         "Ask Question",
 		PrevLine:                            "select previous line",
diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go
index 5248287a9..891d737b0 100644
--- a/pkg/i18n/japanese.go
+++ b/pkg/i18n/japanese.go
@@ -93,7 +93,7 @@ func japaneseTranslationSet() TranslationSet {
 		// LcSquashDown:                        "squash down",
 		// LcFixupCommit:                       "fixup commit",
 		// NoCommitsThisBranch:                 "No commits for this branch",
-		// YouNoCommitsToSquash:                "You have no commits to squash with",
+		// CannotSquashOrFixupFirstCommit:      "There's no commit below to squash into",
 		// Fixup:                               "Fixup",
 		// SureFixupThisCommit:                 "Are you sure you want to 'fixup' this commit? It will be merged into the commit below",
 		// SureSquashThisCommit:                "Are you sure you want to squash this commit into the commit below?",
@@ -215,9 +215,7 @@ func japaneseTranslationSet() TranslationSet {
 		LcCherryPickCopyRange: "コミットを範囲コピー (cherry-pick)",
 		LcPasteCommits:        "コミットを貼り付け (cherry-pick)",
 		// SureCherryPick:                      "Are you sure you want to cherry-pick the copied commits onto this branch?",
-		CherryPick: "Cherry-Pick",
-		// CannotRebaseOntoFirstCommit:         "You cannot interactive rebase onto the first commit",
-		// CannotSquashOntoSecondCommit:        "You cannot squash/fixup onto the second commit",
+		CherryPick:            "Cherry-Pick",
 		Donate:                "支援",
 		AskQuestion:           "質問",
 		PrevLine:              "前の行を選択",
diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go
index c191a436e..fa649bcc0 100644
--- a/pkg/i18n/korean.go
+++ b/pkg/i18n/korean.go
@@ -92,7 +92,7 @@ func koreanTranslationSet() TranslationSet {
 		LcSquashDown:                        "squash down",
 		LcFixupCommit:                       "fixup commit",
 		NoCommitsThisBranch:                 "이 브랜치에 커밋이 없습니다.",
-		YouNoCommitsToSquash:                "You have no commits to squash with",
+		CannotSquashOrFixupFirstCommit:      "There's no commit below to squash into",
 		Fixup:                               "Fixup",
 		SureFixupThisCommit:                 "Are you sure you want to 'fixup' this commit? It will be merged into the commit below",
 		SureSquashThisCommit:                "Are you sure you want to squash this commit into the commit below?",
@@ -217,8 +217,6 @@ func koreanTranslationSet() TranslationSet {
 		LcPasteCommits:                      "커밋을 붙여넣기 (cherry-pick)",
 		SureCherryPick:                      "정말로 복사한 커밋을 이 브랜치에 체리픽하시겠습니까?",
 		CherryPick:                          "체리픽",
-		CannotRebaseOntoFirstCommit:         "첫 번째 커밋에 대해 대화식으로 리베이스할 수 없습니다.",
-		CannotSquashOntoSecondCommit:        "두 번째 커밋을 squash/fixup할 수 없습니다.",
 		Donate:                              "후원",
 		AskQuestion:                         "질문하기",
 		PrevLine:                            "이전 줄 선택",
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index 05534c365..3db26a22c 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -62,7 +62,7 @@ func polishTranslationSet() TranslationSet {
 		LcSquashDown:                        "ściśnij",
 		LcFixupCommit:                       "napraw commit",
 		NoCommitsThisBranch:                 "Brak commitów dla tej gałęzi",
-		YouNoCommitsToSquash:                "Nie masz commitów do spłaszczenia",
+		CannotSquashOrFixupFirstCommit:      "There's no commit below to squash into",
 		Fixup:                               "Napraw",
 		SureFixupThisCommit:                 "Jesteś pewny, ze chcesz naprawić ten commit? Commit poniżej zostanie spłaszczony w górę wraz z tym",
 		LcRewordCommit:                      "zmień nazwę commita",
@@ -149,8 +149,6 @@ func polishTranslationSet() TranslationSet {
 		LcPasteCommits:                      "wklej commity (przebieranie)",
 		SureCherryPick:                      "Czy na pewno chcesz przebierać w skopiowanych commitach na tej gałęzi?",
 		CherryPick:                          "Przebieranie",
-		CannotRebaseOntoFirstCommit:         "Nie można interaktywnie zmienić bazy na pierwszym commicie",
-		CannotSquashOntoSecondCommit:        "Nie można spłaszczyć na drugi commit",
 		Donate:                              "Wesprzyj",
 		PrevLine:                            "poprzednia linia",
 		NextLine:                            "następna linia",