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/japanese.go | |
| 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/japanese.go')
| -rw-r--r-- | pkg/i18n/japanese.go | 1 |
1 files changed, 0 insertions, 1 deletions
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: "カスタムコマンドを実行", |