diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2024-01-23 17:03:44 +0100 |
---|---|---|
committer | Stefan Haller <stefan@haller-berlin.de> | 2024-01-29 09:37:47 +0100 |
commit | b133318b40f9863e9952dddd8acfeffa6dc95b71 (patch) | |
tree | 012317915bba9ee915508e5727ef25e2fbd62060 /pkg/i18n | |
parent | 24e79a057c6ef39d5153a65cacedcdb419d9c7fd (diff) |
Add command to squash all fixups in the current branch
To do that, change the "Apply fixup commits" command to show a menu with the two
choices "in current branch" and "above the selected commit"; we make "in current
branch" the default, as it's the more useful one most of the time, even though
it is a breaking change for those who are used to "shift-S enter" meaning
"squash above selected".
Diffstat (limited to 'pkg/i18n')
-rw-r--r-- | pkg/i18n/chinese.go | 1 | ||||
-rw-r--r-- | pkg/i18n/dutch.go | 1 | ||||
-rw-r--r-- | pkg/i18n/english.go | 14 | ||||
-rw-r--r-- | pkg/i18n/japanese.go | 1 | ||||
-rw-r--r-- | pkg/i18n/korean.go | 1 | ||||
-rw-r--r-- | pkg/i18n/polish.go | 1 | ||||
-rw-r--r-- | pkg/i18n/russian.go | 1 | ||||
-rw-r--r-- | pkg/i18n/traditional_chinese.go | 1 |
8 files changed, 11 insertions, 10 deletions
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 6f4440633..90d53995d 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -254,7 +254,6 @@ func chineseTranslationSet() TranslationSet { ViewResetOptions: `查看重置选项`, CreateFixupCommit: `为此提交创建修正`, SquashAboveCommitsTooltip: `压缩在所选提交之上的所有“fixup!”提交(自动压缩)`, - SureSquashAboveCommits: `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`, CreateFixupCommitTooltip: `创建修正提交`, SureCreateFixupCommit: `您确定要对 {{.commit}} 创建修正提交吗?`, ExecuteCustomCommand: "执行自定义命令", diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 5f7aa2978..7e8a89707 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -217,7 +217,6 @@ func dutchTranslationSet() TranslationSet { HardReset: "Harde reset", CreateFixupCommit: `Creëer fixup commit voor deze commit`, SquashAboveCommitsTooltip: `Squash bovenstaande commits`, - SureSquashAboveCommits: `Weet je zeker dat je alles wil squash/fixup! voor de bovenstaand commits {{.commit}}?`, CreateFixupCommitTooltip: `Creëer fixup commit`, SureCreateFixupCommit: `Weet je zeker dat je een fixup wil maken! commit voor commit {{.commit}}?`, ExecuteCustomCommand: "Voer aangepaste commando uit", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 7d4c60c26..5ff58d085 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -386,8 +386,12 @@ type TranslationSet struct { CreateFixupCommitDescription string CreateFixupCommitTooltip string SquashAboveCommitsTooltip string + SquashCommitsAboveSelectedTooltip string + SquashCommitsInCurrentBranchTooltip string SquashAboveCommits string - SureSquashAboveCommits string + SquashCommitsInCurrentBranch string + SquashCommitsAboveSelectedCommit string + CannotSquashCommitsInCurrentBranch string SureCreateFixupCommit string ExecuteCustomCommand string ExecuteCustomCommandTooltip string @@ -1322,8 +1326,12 @@ func EnglishTranslationSet() TranslationSet { CreateFixupCommitDescription: `Create fixup commit`, CreateFixupCommitTooltip: "Create 'fixup!' commit for the selected commit. Later on, you can press `{{.squashAbove}}` on this same commit to apply all above fixup commits.", SquashAboveCommits: "Apply fixup commits", - SquashAboveCommitsTooltip: `Squash all 'fixup!' commits above selected commit (autosquash).`, - SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`, + SquashAboveCommitsTooltip: `Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash).`, + SquashCommitsAboveSelectedTooltip: `Squash all 'fixup!' commits above the selected commit (autosquash).`, + SquashCommitsInCurrentBranchTooltip: `Squash all 'fixup!' commits in the current branch (autosquash).`, + SquashCommitsInCurrentBranch: "In current branch", + SquashCommitsAboveSelectedCommit: "Above the selected commit", + CannotSquashCommitsInCurrentBranch: "Cannot squash commits in current branch: the HEAD commit is a merge commit or is present on the main branch.", CreateFixupCommit: `Create fixup commit`, SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`, ExecuteCustomCommand: "Execute custom command", diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index 19f1a3ca9..f0947f650 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -263,7 +263,6 @@ func japaneseTranslationSet() TranslationSet { CreateFixupCommitTooltip: `このコミットに対するfixupコミットを作成`, // LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`, // SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`, - SureSquashAboveCommits: `{{.commit}}に対するすべての fixup! コミットをsquashします。よろしいですか?`, CreateFixupCommit: `Fixupコミットを作成`, SureCreateFixupCommit: `{{.commit}} に対する fixup! コミットを作成します。よろしいですか?`, ExecuteCustomCommand: "カスタムコマンドを実行", diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index 26bb0542e..fdfb96c0a 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -258,7 +258,6 @@ func koreanTranslationSet() TranslationSet { ViewResetOptions: `View reset options`, CreateFixupCommitTooltip: `Create fixup commit for this commit`, SquashAboveCommitsTooltip: `Squash all 'fixup!' commits above selected commit (autosquash)`, - SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`, CreateFixupCommit: `Create fixup commit`, SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`, ExecuteCustomCommand: "Execute custom command", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 2366ff174..fdde08a9c 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -180,7 +180,6 @@ func polishTranslationSet() TranslationSet { ViewResetOptions: "Wyświetl opcje resetu", CreateFixupCommitTooltip: "Utwórz commit naprawczy dla tego commita", SquashAboveCommitsTooltip: `Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)`, - SureSquashAboveCommits: `Na pewno chcesz spłaszczyć wszystkie commity naprawcze powyżej {{.commit}}?`, CreateFixupCommit: `Utwóż commit naprawczy`, SureCreateFixupCommit: `Na pewno utworzyć commit naprawczy dla commita {{.commit}}?`, ExecuteCustomCommand: "Wykonaj własną komendę", diff --git a/pkg/i18n/russian.go b/pkg/i18n/russian.go index b1ac91dbf..af3fdd6bd 100644 --- a/pkg/i18n/russian.go +++ b/pkg/i18n/russian.go @@ -314,7 +314,6 @@ func RussianTranslationSet() TranslationSet { ViewResetOptions: `Просмотреть параметры сброса`, CreateFixupCommitTooltip: `Создать fixup коммит для этого коммита`, SquashAboveCommitsTooltip: `Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение)`, - SureSquashAboveCommits: `Вы уверены, что хотите объединить все fixup! коммиты выше {{.commit}}?`, CreateFixupCommit: `Создать fixup коммит`, SureCreateFixupCommit: `Вы уверены, что хотите создать fixup! коммит для коммита {{.commit}}?`, ExecuteCustomCommand: "Выполнить пользовательскую команду", diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go index 76be7b6ef..714c259af 100644 --- a/pkg/i18n/traditional_chinese.go +++ b/pkg/i18n/traditional_chinese.go @@ -341,7 +341,6 @@ func traditionalChineseTranslationSet() TranslationSet { ViewResetOptions: "檢視重設選項", CreateFixupCommitTooltip: "為此提交建立修復提交", SquashAboveCommitsTooltip: "壓縮上方所有的“fixup!”提交 (自動壓縮)", - SureSquashAboveCommits: "你確定要壓縮{{.commit}}上方所有的fixup!提交嗎?", CreateFixupCommit: "建立修復提交", SureCreateFixupCommit: "你確定要為提交{{.commit}}建立fixup!提交嗎?", ExecuteCustomCommand: "執行自訂命令", |