diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 7a6687d9f..4dee9cbad 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -206,7 +206,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <esc>: Return to files panel <tab>: Switch to other panel (staged/unstaged changes) <space>: Toggle line staged / unstaged - d: Delete change (git reset) + d: Discard change (git reset) E: Edit hunk c: Commit changes w: Commit changes without pre-commit hook diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 2f1da2e62..7d2fef98b 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -190,7 +190,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <esc>: Wróć do panelu plików <tab>: Switch to other panel (staged/unstaged changes) <space>: Toggle line staged / unstaged - d: Delete change (git reset) + d: Discard change (git reset) E: Edit hunk c: Zatwierdź zmiany w: Zatwierdź zmiany bez skryptu pre-commit diff --git a/pkg/gui/controllers/staging_controller.go b/pkg/gui/controllers/staging_controller.go index 20a0ada67..46cd6cb69 100644 --- a/pkg/gui/controllers/staging_controller.go +++ b/pkg/gui/controllers/staging_controller.go @@ -66,8 +66,8 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ }, { Key: opts.GetKey(opts.Config.Universal.Remove), - Handler: self.ResetSelection, - Description: self.c.Tr.ResetSelection, + Handler: self.DiscardSelection, + Description: self.c.Tr.DiscardSelection, }, { Key: opts.GetKey(opts.Config.Main.EditSelectHunk), @@ -166,7 +166,7 @@ func (self *StagingController) ToggleStaged() error { return self.applySelectionAndRefresh(self.staged) } -func (self *StagingController) ResetSelection() error { +func (self *StagingController) DiscardSelection() error { reset := func() error { return self.applySelectionAndRefresh(true) } if !self.staged && !self.c.UserConfig.Gui.SkipDiscardChangeWarning { diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 179ed7a01..27576916e 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -167,7 +167,7 @@ func chineseTranslationSet() TranslationSet { FileEnter: `暂存单个 块/行 用于文件, 或 折叠/展开 目录`, FileStagingRequirements: `只能暂存跟踪文件的单独行`, StageSelection: `切换行暂存状态`, - ResetSelection: `取消变更 (git reset)`, + DiscardSelection: `取消变更 (git reset)`, ToggleDragSelect: `切换拖动选择`, ToggleSelectHunk: `切换选择区块`, ToggleSelectionForPatch: `添加/移除 行到补丁`, diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index bd0a15b8e..2c5792e91 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -132,7 +132,7 @@ func dutchTranslationSet() TranslationSet { FileEnter: `Stage individuele hunks/lijnen`, FileStagingRequirements: `Kan alleen individuele lijnen stagen van getrackte bestanden met onstaged veranderingen`, StageSelection: `Toggle lijnen staged / unstaged`, - ResetSelection: `Verwijdert change (git reset)`, + DiscardSelection: `Verwijdert change (git reset)`, ToggleDragSelect: `Toggle drag selecteer`, ToggleSelectHunk: `Toggle selecteer hunk`, ToggleSelectionForPatch: `Voeg toe/verwijder lijn(en) in patch`, diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b95cfdfa4..f375fbea9 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -172,7 +172,7 @@ type TranslationSet struct { FileEnter string FileStagingRequirements string StageSelection string - ResetSelection string + DiscardSelection string ToggleDragSelect string ToggleSelectHunk string ToggleSelectionForPatch string @@ -863,7 +863,7 @@ func EnglishTranslationSet() TranslationSet { FileEnter: `Stage individual hunks/lines for file, or collapse/expand for directory`, FileStagingRequirements: `Can only stage individual lines for tracked files`, StageSelection: `Toggle line staged / unstaged`, - ResetSelection: `Delete change (git reset)`, + DiscardSelection: `Discard change (git reset)`, ToggleDragSelect: `Toggle drag select`, ToggleSelectHunk: `Toggle select hunk`, ToggleSelectionForPatch: `Add/Remove line(s) to patch`, diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index 6713bf4fb..28e51026a 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -167,7 +167,7 @@ func japaneseTranslationSet() TranslationSet { // FileEnter: `stage individual hunks/lines for file, or collapse/expand for directory`, // FileStagingRequirements: `Can only stage individual lines for tracked files`, StageSelection: `選択行をステージ/アンステージ`, - ResetSelection: `変更を削除 (git reset)`, + DiscardSelection: `変更を削除 (git reset)`, ToggleDragSelect: `範囲選択を切り替え`, ToggleSelectHunk: `Hunk選択を切り替え`, ToggleSelectionForPatch: `行をパッチに追加/削除`, diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index ea4446d24..10d399917 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -168,7 +168,7 @@ func koreanTranslationSet() TranslationSet { FileEnter: `Stage individual hunks/lines for file, or collapse/expand for directory`, FileStagingRequirements: `추적된 파일에 대해 개별 라인만 stage할 수 있습니다.`, StageSelection: `선택한 행을 staged / unstaged`, - ResetSelection: `변경을 삭제 (git reset)`, + DiscardSelection: `변경을 삭제 (git reset)`, ToggleDragSelect: `드래그 선택 전환`, ToggleSelectHunk: `Toggle select hunk`, ToggleSelectionForPatch: `Line(s)을 패치에 추가/삭제`, diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go index bfcca1c1b..12d38d768 100644 --- a/pkg/i18n/traditional_chinese.go +++ b/pkg/i18n/traditional_chinese.go @@ -231,7 +231,7 @@ func traditionalChineseTranslationSet() TranslationSet { FileEnter: `選擇檔案中的單個程式碼塊/行，或展開/折疊目錄`, FileStagingRequirements: `只能選擇跟踪檔案中的單個行`, StageSelection: `切換現有行的狀態 (已預存/未預存)`, - ResetSelection: `刪除變更 (git reset)`, + DiscardSelection: `刪除變更 (git reset)`, ToggleDragSelect: `切換拖曳選擇`, ToggleSelectHunk: `切換選擇程式碼塊`, ToggleSelectionForPatch: `向 (或從) 補丁中添加/刪除行`,