diff --git a/docs-master/keybindings/Keybindings_en.md b/docs-master/keybindings/Keybindings_en.md index ef4e1c546..0277cb653 100644 --- a/docs-master/keybindings/Keybindings_en.md +++ b/docs-master/keybindings/Keybindings_en.md @@ -229,7 +229,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Stage | Toggle selection staged / unstaged. | | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Edit hunk | Edit selected hunk in external editor. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Go to previous hunk | | | `` , l `` | Go to next hunk | | | `` N `` | Go to previous file | | @@ -311,7 +311,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Stage | Toggle selection staged / unstaged. | | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Edit hunk | Edit selected hunk in external editor. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Go to previous hunk | | | `` , l `` | Go to next hunk | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_ja.md b/docs-master/keybindings/Keybindings_ja.md index 4aef4bd13..dc4d085ee 100644 --- a/docs-master/keybindings/Keybindings_ja.md +++ b/docs-master/keybindings/Keybindings_ja.md @@ -198,7 +198,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 | | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 | | `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 | -| `` `` | 選択したテキストをクリップボードにコピー | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 前のハンクに移動 | | | `` , l `` | 次のハンクに移動 | | | `` N `` | Go to previous file | | @@ -288,7 +288,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 | | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 | | `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 | -| `` `` | 選択したテキストをクリップボードにコピー | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 前のハンクに移動 | | | `` , l `` | 次のハンクに移動 | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_ko.md b/docs-master/keybindings/Keybindings_ko.md index 87be58b6b..e87332ed2 100644 --- a/docs-master/keybindings/Keybindings_ko.md +++ b/docs-master/keybindings/Keybindings_ko.md @@ -90,7 +90,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Staged 전환 | 선택한 행을 staged / unstaged | | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Edit hunk | Edit selected hunk in external editor. | -| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 이전 hunk를 선택 | | | `` , l `` | 다음 hunk를 선택 | | | `` N `` | Go to previous file | | @@ -183,7 +183,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Staged 전환 | 선택한 행을 staged / unstaged | | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Edit hunk | Edit selected hunk in external editor. | -| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 이전 hunk를 선택 | | | `` , l `` | 다음 hunk를 선택 | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_nl.md b/docs-master/keybindings/Keybindings_nl.md index c860ae500..d130c9531 100644 --- a/docs-master/keybindings/Keybindings_nl.md +++ b/docs-master/keybindings/Keybindings_nl.md @@ -237,7 +237,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Toggle staged | Toggle lijnen staged / unstaged | | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Edit hunk | Edit selected hunk in external editor. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Selecteer de vorige hunk | | | `` , l `` | Selecteer de volgende hunk | | | `` N `` | Go to previous file | | @@ -311,7 +311,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Toggle staged | Toggle lijnen staged / unstaged | | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Edit hunk | Edit selected hunk in external editor. | -| `` `` | Copy selected text to clipboard | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Selecteer de vorige hunk | | | `` , l `` | Selecteer de volgende hunk | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_pl.md b/docs-master/keybindings/Keybindings_pl.md index a612f44ab..3c191bc8a 100644 --- a/docs-master/keybindings/Keybindings_pl.md +++ b/docs-master/keybindings/Keybindings_pl.md @@ -105,7 +105,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. | | `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. | | `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. | -| `` `` | Kopiuj zaznaczony tekst do schowka | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Idź do poprzedniego fragmentu | | | `` , l `` | Idź do następnego fragmentu | | | `` N `` | Go to previous file | | @@ -206,7 +206,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. | | `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. | | `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. | -| `` `` | Kopiuj zaznaczony tekst do schowka | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Idź do poprzedniego fragmentu | | | `` , l `` | Idź do następnego fragmentu | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_pt.md b/docs-master/keybindings/Keybindings_pt.md index 252c72060..2723f1189 100644 --- a/docs-master/keybindings/Keybindings_pt.md +++ b/docs-master/keybindings/Keybindings_pt.md @@ -241,7 +241,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Etapa | Ativar/desativar seleção em staged/unstaged | | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. | | `` E `` | Editar hunk | Editar o local selecionado no editor externo. | -| `` `` | Copiar texto selecionado para área de transferência | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Ir para o local anterior | | | `` , l `` | Ir para o próximo trecho | | | `` N `` | Go to previous file | | @@ -320,7 +320,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Etapa | Ativar/desativar seleção em staged/unstaged | | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. | | `` E `` | Editar hunk | Editar o local selecionado no editor externo. | -| `` `` | Copiar texto selecionado para área de transferência | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Ir para o local anterior | | | `` , l `` | Ir para o próximo trecho | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_ru.md b/docs-master/keybindings/Keybindings_ru.md index ef48dd235..591b55c3d 100644 --- a/docs-master/keybindings/Keybindings_ru.md +++ b/docs-master/keybindings/Keybindings_ru.md @@ -80,7 +80,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные | | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Изменить эту часть | Edit selected hunk in external editor. | -| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Выбрать предыдущую часть | | | `` , l `` | Выбрать следующую часть | | | `` N `` | Go to previous file | | @@ -105,7 +105,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные | | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. | | `` E `` | Изменить эту часть | Edit selected hunk in external editor. | -| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | Выбрать предыдущую часть | | | `` , l `` | Выбрать следующую часть | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_zh-CN.md b/docs-master/keybindings/Keybindings_zh-CN.md index 773e2e8e9..f51a4f8c0 100644 --- a/docs-master/keybindings/Keybindings_zh-CN.md +++ b/docs-master/keybindings/Keybindings_zh-CN.md @@ -276,7 +276,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 切换暂存状态 | 切换行暂存状态 | | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时,使用git reset丢弃该变更。当选择已暂存的变更时,取消暂存该变更 | | `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 | -| `` `` | 复制选中文本到剪贴板 | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 选择上一个区块 | | | `` , l `` | 选择下一个区块 | | | `` N `` | Go to previous file | | @@ -317,7 +317,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 切换暂存状态 | 切换行暂存状态 | | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时,使用git reset丢弃该变更。当选择已暂存的变更时,取消暂存该变更 | | `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 | -| `` `` | 复制选中文本到剪贴板 | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 选择上一个区块 | | | `` , l `` | 选择下一个区块 | | | `` N `` | Go to previous file | | diff --git a/docs-master/keybindings/Keybindings_zh-TW.md b/docs-master/keybindings/Keybindings_zh-TW.md index 2a70fca04..e04968bef 100644 --- a/docs-master/keybindings/Keybindings_zh-TW.md +++ b/docs-master/keybindings/Keybindings_zh-TW.md @@ -65,7 +65,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) | | `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時,使用 `git reset` 捨棄變更。選取已暫存的變更時,取消暫存變更。 | | `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 | -| `` `` | 複製所選文本至剪貼簿 | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 選擇上一段 | | | `` , l `` | 選擇下一段 | | | `` N `` | Go to previous file | | @@ -339,7 +339,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) | | `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時,使用 `git reset` 捨棄變更。選取已暫存的變更時,取消暫存變更。 | | `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 | -| `` `` | 複製所選文本至剪貼簿 | | +| `` `` | Copy selected diff lines to clipboard | | | `` , h `` | 選擇上一段 | | | `` , l `` | 選擇下一段 | | | `` N `` | Go to previous file | | diff --git a/pkg/gui/controllers/main_view_controller.go b/pkg/gui/controllers/main_view_controller.go index 0672c3f3c..ef54d149e 100644 --- a/pkg/gui/controllers/main_view_controller.go +++ b/pkg/gui/controllers/main_view_controller.go @@ -117,8 +117,8 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty { Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard), Handler: self.copySelection, - Description: self.c.Tr.CopySelectedTextToClipboard, - DescriptionFunc: self.diffSelectionDescriptionText(self.c.Tr.CopySelectedTextToClipboard), + Description: self.c.Tr.CopySelectedDiffLinesToClipboard, + DescriptionFunc: self.diffSelectionDescriptionText(self.c.Tr.CopySelectedDiffLinesToClipboard), GetDisabledReason: self.diffSelectionDisabledReason, }, { diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index bcb153ad3..170d1abb1 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -733,7 +733,7 @@ type TranslationSet struct { CopyTagToClipboard string CopyPathToClipboard string CommitPrefixPatternError string - CopySelectedTextToClipboard string + CopySelectedDiffLinesToClipboard string SelectedDiffLinesCopiedToast string SelectionNotFoundInDiffToast string NoFilesStagedTitle string @@ -1911,7 +1911,7 @@ func EnglishTranslationSet() *TranslationSet { CopyBranchNameToClipboard: "Copy branch name to clipboard", CopyTagToClipboard: "Copy tag to clipboard", CopyPathToClipboard: "Copy path to clipboard", - CopySelectedTextToClipboard: "Copy selected text to clipboard", + CopySelectedDiffLinesToClipboard: "Copy selected diff lines to clipboard", SelectedDiffLinesCopiedToast: "Selected diff lines copied to clipboard", SelectionNotFoundInDiffToast: "Nothing in the selection could be found in the diff", CommitPrefixPatternError: "Error in commitPrefix pattern",