mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-24 07:25:20 -05:00
Support select range for cherry pick
This requires us to change the 'v' keybinding for paste to something else, now that 'v' is used globally for toggling range select. So I'm using 'shift+v' and I'm likewise changing 'c' to 'shift+c' for copying, so that they're consistent. We will need to clearly communicate this change in keybindings.
This commit is contained in:
@@ -198,7 +198,6 @@ func chineseTranslationSet() TranslationSet {
|
||||
YouAreHere: "您在这里",
|
||||
RewordNotSupported: "当前不支持交互式重新基准化时的重新措词提交",
|
||||
CherryPickCopy: "复制提交(拣选)",
|
||||
CherryPickCopyRange: "复制提交范围(拣选)",
|
||||
PasteCommits: "粘贴提交(拣选)",
|
||||
SureCherryPick: "您确定要将选中的提交进行拣选到这个分支吗?",
|
||||
CherryPick: "拣选 (Cherry-Pick)",
|
||||
|
||||
@@ -163,7 +163,6 @@ func dutchTranslationSet() TranslationSet {
|
||||
YouAreHere: "JE BENT HIER",
|
||||
RewordNotSupported: "Herformatteren van commits in interactief rebasen is nog niet ondersteund",
|
||||
CherryPickCopy: "Kopieer commit (cherry-pick)",
|
||||
CherryPickCopyRange: "Kopieer commit reeks (cherry-pick)",
|
||||
PasteCommits: "Plak commits (cherry-pick)",
|
||||
SureCherryPick: "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?",
|
||||
CherryPick: "Cherry-Pick",
|
||||
|
||||
@@ -251,7 +251,6 @@ type TranslationSet struct {
|
||||
RewordNotSupported string
|
||||
ChangingThisActionIsNotAllowed string
|
||||
CherryPickCopy string
|
||||
CherryPickCopyRange string
|
||||
PasteCommits string
|
||||
SureCherryPick string
|
||||
CherryPick string
|
||||
@@ -1090,7 +1089,6 @@ func EnglishTranslationSet() TranslationSet {
|
||||
RewordNotSupported: "Rewording commits while interactively rebasing is not currently supported",
|
||||
ChangingThisActionIsNotAllowed: "Changing this kind of rebase todo entry is not allowed",
|
||||
CherryPickCopy: "Copy commit (cherry-pick)",
|
||||
CherryPickCopyRange: "Copy commit range (cherry-pick)",
|
||||
PasteCommits: "Paste commits (cherry-pick)",
|
||||
SureCherryPick: "Are you sure you want to cherry-pick the copied commits onto this branch?",
|
||||
CherryPick: "Cherry-pick",
|
||||
|
||||
@@ -201,9 +201,8 @@ func japaneseTranslationSet() TranslationSet {
|
||||
// NoRoom: "Not enough room",
|
||||
YouAreHere: "現在位置",
|
||||
// LcRewordNotSupported: "Rewording commits while interactively rebasing is not currently supported",
|
||||
CherryPickCopy: "コミットをコピー (cherry-pick)",
|
||||
CherryPickCopyRange: "コミットを範囲コピー (cherry-pick)",
|
||||
PasteCommits: "コミットを貼り付け (cherry-pick)",
|
||||
CherryPickCopy: "コミットをコピー (cherry-pick)",
|
||||
PasteCommits: "コミットを貼り付け (cherry-pick)",
|
||||
// SureCherryPick: "Are you sure you want to cherry-pick the copied commits onto this branch?",
|
||||
CherryPick: "Cherry-Pick",
|
||||
Donate: "支援",
|
||||
|
||||
@@ -199,7 +199,6 @@ func koreanTranslationSet() TranslationSet {
|
||||
YouAreHere: "현재 위치",
|
||||
RewordNotSupported: "Rewording commits while interactively rebasing is not currently supported",
|
||||
CherryPickCopy: "커밋을 복사 (cherry-pick)",
|
||||
CherryPickCopyRange: "커밋을 범위로 복사 (cherry-pick)",
|
||||
PasteCommits: "커밋을 붙여넣기 (cherry-pick)",
|
||||
SureCherryPick: "정말로 복사한 커밋을 이 브랜치에 체리픽하시겠습니까?",
|
||||
CherryPick: "체리픽",
|
||||
|
||||
@@ -131,7 +131,6 @@ func polishTranslationSet() TranslationSet {
|
||||
YouAreHere: "JESTEŚ TU",
|
||||
RewordNotSupported: "Przeredagowanie commitów podczas interaktywnej zmiany bazy nie jest obecnie wspierane",
|
||||
CherryPickCopy: "Kopiuj commit (przebieranie)",
|
||||
CherryPickCopyRange: "Kopiuj zakres commitów (przebieranie)",
|
||||
PasteCommits: "Wklej commity (przebieranie)",
|
||||
SureCherryPick: "Czy na pewno chcesz przebierać w skopiowanych commitach na tej gałęzi?",
|
||||
CherryPick: "Przebieranie",
|
||||
|
||||
@@ -243,7 +243,6 @@ func RussianTranslationSet() TranslationSet {
|
||||
RewordNotSupported: "Переформулировка коммитов при интерактивном перебазировании в настоящее время не поддерживается",
|
||||
ChangingThisActionIsNotAllowed: "Изменение этого типа записи todo перебазирования не допускается",
|
||||
CherryPickCopy: "Скопировать отобранные коммит (cherry-pick)",
|
||||
CherryPickCopyRange: "Скопировать несколько отобранных коммитов (cherry-pick)",
|
||||
PasteCommits: "Вставить отобранные коммиты (cherry-pick)",
|
||||
SureCherryPick: "Вы уверены, что хотите выборочно применить (cherry-picked) отобранные коммиты в эту ветку?",
|
||||
CherryPick: "Выборочная отборка (Cherry-Pick)",
|
||||
|
||||
@@ -274,7 +274,6 @@ func traditionalChineseTranslationSet() TranslationSet {
|
||||
RewordNotSupported: "在互動變基期間改寫提交目前不支持",
|
||||
ChangingThisActionIsNotAllowed: "不允許更改此類變基待辦事項",
|
||||
CherryPickCopy: "複製提交 (揀選)",
|
||||
CherryPickCopyRange: "複製提交範圍 (揀選)",
|
||||
PasteCommits: "貼上提交 (揀選)",
|
||||
SureCherryPick: "你確定要將複製的提交揀選到此分支嗎?",
|
||||
CherryPick: "揀選 (Cherry-pick)",
|
||||
|
||||
Reference in New Issue
Block a user