mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-11-24 08:52:21 +02:00
Remove CreateFixupCommitDescription as it's identical to CreateFixupCommit
This commit is contained in:
parent
e23337f8f5
commit
c92e9d9bdc
@ -105,7 +105,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
||||
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
|
||||
If you would instead like to start an interactive rebase from the selected commit, press `e`. |
|
||||
| `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. |
|
||||
| `` F `` | Create fixup commit | このコミットに対するfixupコミットを作成 |
|
||||
| `` F `` | Fixupコミットを作成 | このコミットに対するfixupコミットを作成 |
|
||||
| `` S `` | Apply fixup commits | Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash). |
|
||||
| `` <c-j> `` | コミットを1つ下に移動 | |
|
||||
| `` <c-k> `` | コミットを1つ上に移動 | |
|
||||
|
@ -151,7 +151,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
||||
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
|
||||
If you would instead like to start an interactive rebase from the selected commit, press `e`. |
|
||||
| `` p `` | Pick | Kies commit (wanneer midden in rebase) |
|
||||
| `` F `` | Create fixup commit | Creëer fixup commit |
|
||||
| `` F `` | Creëer fixup commit | Creëer fixup commit |
|
||||
| `` S `` | Apply fixup commits | Squash bovenstaande commits |
|
||||
| `` <c-j> `` | Verplaats commit 1 naar beneden | |
|
||||
| `` <c-k> `` | Verplaats commit 1 naar boven | |
|
||||
|
@ -152,7 +152,7 @@ _Связки клавиш_
|
||||
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
|
||||
If you would instead like to start an interactive rebase from the selected commit, press `e`. |
|
||||
| `` p `` | Pick | Выбрать коммит (в середине перебазирования) |
|
||||
| `` F `` | Create fixup commit | Создать fixup коммит для этого коммита |
|
||||
| `` F `` | Создать fixup коммит | Создать fixup коммит для этого коммита |
|
||||
| `` S `` | Apply fixup commits | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) |
|
||||
| `` <c-j> `` | Переместить коммит вниз на один | |
|
||||
| `` <c-k> `` | Переместить коммит вверх на один | |
|
||||
|
@ -149,7 +149,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
||||
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
|
||||
If you would instead like to start an interactive rebase from the selected commit, press `e`. |
|
||||
| `` p `` | Pick | 选择提交(变基过程中) |
|
||||
| `` F `` | Create fixup commit | 创建修正提交 |
|
||||
| `` F `` | 为此提交创建修正 | 创建修正提交 |
|
||||
| `` S `` | Apply fixup commits | 压缩在所选提交之上的所有“fixup!”提交(自动压缩) |
|
||||
| `` <c-j> `` | 下移提交 | |
|
||||
| `` <c-k> `` | 上移提交 | |
|
||||
|
@ -174,7 +174,7 @@ _說明:`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B,`B`表示 Shift+B
|
||||
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
|
||||
If you would instead like to start an interactive rebase from the selected commit, press `e`. |
|
||||
| `` p `` | Pick | 挑選提交 (於變基過程中) |
|
||||
| `` F `` | Create fixup commit | 為此提交建立修復提交 |
|
||||
| `` F `` | 建立修復提交 | 為此提交建立修復提交 |
|
||||
| `` S `` | 壓縮上方所有「fixup」提交(自動壓縮) | 是否壓縮上方 {{.commit}} 所有「fixup」提交? |
|
||||
| `` <c-j> `` | 向下移動提交 | |
|
||||
| `` <c-k> `` | 向上移動提交 | |
|
||||
|
@ -157,7 +157,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
|
||||
Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit),
|
||||
Handler: self.withItem(self.createFixupCommit),
|
||||
GetDisabledReason: self.require(self.singleItemSelected()),
|
||||
Description: self.c.Tr.CreateFixupCommitDescription,
|
||||
Description: self.c.Tr.CreateFixupCommit,
|
||||
Tooltip: utils.ResolvePlaceholderString(
|
||||
self.c.Tr.CreateFixupCommitTooltip,
|
||||
map[string]string{
|
||||
|
@ -214,7 +214,7 @@ func dutchTranslationSet() TranslationSet {
|
||||
DiscardUntrackedFiles: "Negeer niet-gevonden bestanden",
|
||||
ViewResetOptions: `Bekijk reset opties`,
|
||||
HardReset: "Harde reset",
|
||||
CreateFixupCommit: `Creëer fixup commit voor deze commit`,
|
||||
CreateFixupCommit: `Creëer fixup commit`,
|
||||
SquashAboveCommitsTooltip: `Squash bovenstaande commits`,
|
||||
CreateFixupCommitTooltip: `Creëer fixup commit`,
|
||||
SureCreateFixupCommit: `Weet je zeker dat je een fixup wil maken! commit voor commit {{.commit}}?`,
|
||||
|
@ -391,7 +391,6 @@ type TranslationSet struct {
|
||||
ViewResetOptions string
|
||||
FileResetOptionsTooltip string
|
||||
CreateFixupCommit string
|
||||
CreateFixupCommitDescription string
|
||||
CreateFixupCommitTooltip string
|
||||
SquashAboveCommitsTooltip string
|
||||
SquashCommitsAboveSelectedTooltip string
|
||||
@ -1355,7 +1354,7 @@ func EnglishTranslationSet() TranslationSet {
|
||||
ViewResetOptions: `Reset`,
|
||||
FileResetOptionsTooltip: "View reset options for working tree (e.g. nuking the working tree).",
|
||||
FixupTooltip: "Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded.",
|
||||
CreateFixupCommitDescription: `Create fixup commit`,
|
||||
CreateFixupCommit: "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, either above the selected commit, or all in current branch (autosquash).`,
|
||||
@ -1364,7 +1363,6 @@ func EnglishTranslationSet() TranslationSet {
|
||||
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",
|
||||
ExecuteCustomCommandTooltip: "Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands.",
|
||||
|
@ -381,7 +381,6 @@ func polishTranslationSet() TranslationSet {
|
||||
ViewResetOptions: `Reset`,
|
||||
FileResetOptionsTooltip: "Wyświetl opcje resetu dla drzewa roboczego (np. zniszczenie drzewa roboczego).",
|
||||
FixupTooltip: "Włącz wybrany commit do commita poniżej. Podobnie do fixup, ale wiadomość wybranego commita zostanie odrzucona.",
|
||||
CreateFixupCommitDescription: `Utwórz commit fixup`,
|
||||
CreateFixupCommitTooltip: "Utwórz commit 'fixup!' dla wybranego commita. Później możesz nacisnąć `{{.squashAbove}}` na tym samym commicie, aby zastosować wszystkie powyższe commity fixup.",
|
||||
SquashAboveCommits: "Zastosuj commity fixup",
|
||||
SquashAboveCommitsTooltip: `Scal wszystkie commity 'fixup!', albo powyżej wybranego commita, albo wszystkie w bieżącej gałęzi (autosquash).`,
|
||||
|
Loading…
Reference in New Issue
Block a user