starred/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-24 07:25:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support range select in rebase actions

Browse Source
This commit is contained in:
Jesse Duffield
2024-01-23 17:23:56 +11:00
parent 44e2542e4a
commit f0de880136
26 changed files with 776 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/i18n/chinese.go
+2 -2
View File
@@ -217,8 +217,8 @@ func chineseTranslationSet() TranslationSet {
ScrollDownMainPanel: "向下滚动主面板",
AmendCommitTitle: "修改提交",
AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？",
DeleteCommitTitle: "删除提交",
DeleteCommitPrompt: "您确定要删除此提交吗？",
DropCommitTitle: "删除提交",
DropCommitPrompt: "您确定要删除此提交吗？",
PullingStatus: "正在拉取",
PushingStatus: "正在推送",
FetchingStatus: "正在抓取",
pkg/i18n/dutch.go
+2 -2
View File
@@ -181,8 +181,8 @@ func dutchTranslationSet() TranslationSet {
ScrollDownMainPanel: "Scroll naar beneden vanaf hoofdpaneel",
AmendCommitTitle: "Commit wijzigen",
AmendCommitPrompt: "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?",
DeleteCommitTitle: "Verwijder commit",
DeleteCommitPrompt: "Weet je zeker dat je deze commit wil verwijderen?",
DropCommitTitle: "Verwijder commit",
DropCommitPrompt: "Weet je zeker dat je deze commit wil verwijderen?",
PullingStatus: "Pullen",
PushingStatus: "Pushen",
FetchingStatus: "Fetchen",
pkg/i18n/english.go
+12 -10
View File
@@ -119,6 +119,7 @@ type TranslationSet struct {
DeleteCommit string
MoveDownCommit string
MoveUpCommit string
CannotMoveAnyFurther string
EditCommit string
AmendToCommit string
ResetAuthor string
@@ -239,6 +240,7 @@ type TranslationSet struct {
SimpleRebase string
InteractiveRebase string
InteractiveRebaseTooltip string
MustSelectTodoCommits string
ConfirmMerge string
FwdNoUpstream string
FwdNoLocalUpstream string
@@ -270,14 +272,15 @@ type TranslationSet struct {
ScrollDownMainPanel string
AmendCommitTitle string
AmendCommitPrompt string
DeleteCommitTitle string
DeleteCommitPrompt string
DropCommitTitle string
DropCommitPrompt string
PullingStatus string
PushingStatus string
FetchingStatus string
SquashingStatus string
FixingStatus string
DeletingStatus string
DroppingStatus string
MovingStatus string
RebasingStatus string
MergingStatus string
@@ -686,8 +689,6 @@ type Log struct {
CherryPickCommits string
HandleUndo string
HandleMidRebaseCommand string
MovingCommitUp string
MovingCommitDown string
RemoveFile string
CopyToClipboard string
Remove string
@@ -945,8 +946,8 @@ func EnglishTranslationSet() TranslationSet {
UpdateRefHere: "Update branch '{{.ref}}' here",
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?",
SureFixupThisCommit: "Are you sure you want to 'fixup' the selected commit(s) into the commit below?",
SureSquashThisCommit: "Are you sure you want to squash the selected commit(s) into the commit below?",
Squash: "Squash",
PickCommit: "Pick commit (when mid-rebase)",
RevertCommit: "Revert commit",
@@ -954,6 +955,7 @@ func EnglishTranslationSet() TranslationSet {
DeleteCommit: "Delete commit",
MoveDownCommit: "Move commit down one",
MoveUpCommit: "Move commit up one",
CannotMoveAnyFurther: "Cannot move any further",
EditCommit: "Edit commit",
AmendToCommit: "Amend commit with staged changes",
ResetAuthor: "Reset author",
@@ -1079,6 +1081,7 @@ func EnglishTranslationSet() TranslationSet {
SimpleRebase: "Simple rebase",
InteractiveRebase: "Interactive rebase",
InteractiveRebaseTooltip: "Begin an interactive rebase with a break at the start, so you can update the TODO commits before continuing",
MustSelectTodoCommits: "When rebasing, this action only works on a selection of TODO commits.",
ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
FwdNoUpstream: "Cannot fast-forward a branch with no upstream",
FwdNoLocalUpstream: "Cannot fast-forward a branch whose remote is not registered locally",
@@ -1110,14 +1113,15 @@ func EnglishTranslationSet() TranslationSet {
ScrollDownMainPanel: "Scroll down main panel",
AmendCommitTitle: "Amend commit",
AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?",
DeleteCommitTitle: "Delete commit",
DeleteCommitPrompt: "Are you sure you want to delete this commit?",
DropCommitTitle: "Drop commit",
DropCommitPrompt: "Are you sure you want to drop the selected commit(s)?",
PullingStatus: "Pulling",
PushingStatus: "Pushing",
FetchingStatus: "Fetching",
SquashingStatus: "Squashing",
FixingStatus: "Fixing up",
DeletingStatus: "Deleting",
DroppingStatus: "Dropping",
MovingStatus: "Moving",
RebasingStatus: "Rebasing",
MergingStatus: "Merging",
@@ -1626,8 +1630,6 @@ func EnglishTranslationSet() TranslationSet {
CherryPickCommits: "Cherry-picking commits:\n'{{.commitLines}}'",
HandleUndo: "Undoing last conflict resolution",
HandleMidRebaseCommand: "Updating rebase action of commit {{.shortSha}} to '{{.action}}'",
MovingCommitUp: "Moving commit {{.shortSha}} up",
MovingCommitDown: "Moving commit {{.shortSha}} down",
RemoveFile: "Deleting path '{{.path}}'",
CopyToClipboard: "Copying '{{.str}}' to clipboard",
Remove: "Removing '{{.filename}}'",
pkg/i18n/japanese.go
+2 -2
View File
@@ -221,8 +221,8 @@ func japaneseTranslationSet() TranslationSet {
ScrollDownMainPanel: "メインパネルを下にスクロール",
AmendCommitTitle: "Amendコミット",
AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?",
DeleteCommitTitle: "コミットを削除",
DeleteCommitPrompt: "選択されたコミットを削除します。よろしいですか?",
DropCommitTitle: "コミットを削除",
DropCommitPrompt: "選択されたコミットを削除します。よろしいですか?",
PullingStatus: "Pull中",
PushingStatus: "Push中",
FetchingStatus: "Fetch中",
pkg/i18n/korean.go
+2 -2
View File
@@ -218,8 +218,8 @@ func koreanTranslationSet() TranslationSet {
ScrollDownMainPanel: "메인 패널을 아래로로 스크롤",
AmendCommitTitle: "Amend commit",
AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?",
DeleteCommitTitle: "커밋 삭제",
DeleteCommitPrompt: "정말로 선택한 커밋을 삭제하시겠습니까?",
DropCommitTitle: "커밋 삭제",
DropCommitPrompt: "정말로 선택한 커밋을 삭제하시겠습니까?",
PullingStatus: "업데이트 중",
PushingStatus: "푸시 중",
FetchingStatus: "패치 중",
pkg/i18n/polish.go
+2 -2
View File
@@ -147,8 +147,8 @@ func polishTranslationSet() TranslationSet {
ScrollUp: "Przewiń w górę",
AmendCommitTitle: "Popraw commit",
AmendCommitPrompt: "Czy na pewno chcesz poprawić ten commit plikami z poczekalni?",
DeleteCommitTitle: "Usuń commit",
DeleteCommitPrompt: "Czy na pewno usunąć ten commit?",
DropCommitTitle: "Usuń commit",
DropCommitPrompt: "Czy na pewno usunąć ten commit?",
PullingStatus: "Pobieranie zmian",
PushingStatus: "Wysyłanie zmian",
FetchingStatus: "Pobieram",
pkg/i18n/russian.go
+2 -2
View File
@@ -262,8 +262,8 @@ func RussianTranslationSet() TranslationSet {
ScrollDownMainPanel: "Прокрутить вниз главную панель",
AmendCommitTitle: "Править коммит (amend)",
AmendCommitPrompt: "Вы уверены, что хотите править этот коммит проиндексированными файлами?",
DeleteCommitTitle: "Удалить коммит",
DeleteCommitPrompt: "Вы уверены, что хотите удалить этот коммит?",
DropCommitTitle: "Удалить коммит",
DropCommitPrompt: "Вы уверены, что хотите удалить этот коммит?",
PullingStatus: "Получение и слияние изменении",
PushingStatus: "Отправка изменении",
FetchingStatus: "Получение изменении",
pkg/i18n/traditional_chinese.go
+2 -2
View File
@@ -293,8 +293,8 @@ func traditionalChineseTranslationSet() TranslationSet {
ScrollDownMainPanel: "向下捲動主面板",
AmendCommitTitle: "修正提交",
AmendCommitPrompt: "你確定要使用預存的檔案修正此提交嗎？",
DeleteCommitTitle: "刪除提交",
DeleteCommitPrompt: "你確定要刪除此提交嗎？",
DropCommitTitle: "刪除提交",
DropCommitPrompt: "你確定要刪除此提交嗎？",
PullingStatus: "拉取",
PushingStatus: "推送",
FetchingStatus: "擷取",