mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-08 22:36:49 +02:00
Remove unused TranslationSet fields
These were found by commenting out the initialization of the struct literal in EnglishTranslationSet.TranslationSet(), and then running $ punused pkg/i18n/**/*.go Punused can be installed with `go install github.com/bep/punused@latest`.
This commit is contained in:
@@ -21,7 +21,6 @@ type TranslationSet struct {
|
|||||||
EasterEgg string
|
EasterEgg string
|
||||||
UnstagedChanges string
|
UnstagedChanges string
|
||||||
StagedChanges string
|
StagedChanges string
|
||||||
MainTitle string
|
|
||||||
StagingTitle string
|
StagingTitle string
|
||||||
MergingTitle string
|
MergingTitle string
|
||||||
SquashMergeUncommittedTitle string
|
SquashMergeUncommittedTitle string
|
||||||
@@ -55,7 +54,6 @@ type TranslationSet struct {
|
|||||||
HunksWithOnlyAddedLinesWarning string
|
HunksWithOnlyAddedLinesWarning string
|
||||||
StatusTitle string
|
StatusTitle string
|
||||||
GlobalTitle string
|
GlobalTitle string
|
||||||
Menu string
|
|
||||||
Execute string
|
Execute string
|
||||||
Stage string
|
Stage string
|
||||||
StageTooltip string
|
StageTooltip string
|
||||||
@@ -72,7 +70,6 @@ type TranslationSet struct {
|
|||||||
Pull string
|
Pull string
|
||||||
PushTooltip string
|
PushTooltip string
|
||||||
PullTooltip string
|
PullTooltip string
|
||||||
Scroll string
|
|
||||||
FileFilter string
|
FileFilter string
|
||||||
CopyToClipboardMenu string
|
CopyToClipboardMenu string
|
||||||
CopyFileName string
|
CopyFileName string
|
||||||
@@ -127,7 +124,6 @@ type TranslationSet struct {
|
|||||||
DeleteBranchesTitle string
|
DeleteBranchesTitle string
|
||||||
DeleteLocalBranch string
|
DeleteLocalBranch string
|
||||||
DeleteLocalBranches string
|
DeleteLocalBranches string
|
||||||
DeleteRemoteBranchOption string
|
|
||||||
DeleteRemoteBranchPrompt string
|
DeleteRemoteBranchPrompt string
|
||||||
DeleteRemoteBranchesPrompt string
|
DeleteRemoteBranchesPrompt string
|
||||||
DeleteLocalAndRemoteBranchPrompt string
|
DeleteLocalAndRemoteBranchPrompt string
|
||||||
@@ -175,12 +171,9 @@ type TranslationSet struct {
|
|||||||
SureFixupThisCommit string
|
SureFixupThisCommit string
|
||||||
SureSquashThisCommit string
|
SureSquashThisCommit string
|
||||||
Squash string
|
Squash string
|
||||||
SquashMerge string
|
|
||||||
PickCommitTooltip string
|
PickCommitTooltip string
|
||||||
Pick string
|
Pick string
|
||||||
CantPickDisabledReason string
|
|
||||||
Edit string
|
Edit string
|
||||||
RevertCommit string
|
|
||||||
Revert string
|
Revert string
|
||||||
RevertCommitTooltip string
|
RevertCommitTooltip string
|
||||||
Reword string
|
Reword string
|
||||||
@@ -205,7 +198,6 @@ type TranslationSet struct {
|
|||||||
SetAuthorPromptTitle string
|
SetAuthorPromptTitle string
|
||||||
AddCoAuthorPromptTitle string
|
AddCoAuthorPromptTitle string
|
||||||
AddCoAuthorTooltip string
|
AddCoAuthorTooltip string
|
||||||
SureResetCommitAuthor string
|
|
||||||
RewordCommitEditor string
|
RewordCommitEditor string
|
||||||
NoCommitsThisBranch string
|
NoCommitsThisBranch string
|
||||||
UpdateRefHere string
|
UpdateRefHere string
|
||||||
@@ -293,7 +285,6 @@ type TranslationSet struct {
|
|||||||
DisabledInFlatView string
|
DisabledInFlatView string
|
||||||
FileEnter string
|
FileEnter string
|
||||||
FileEnterTooltip string
|
FileEnterTooltip string
|
||||||
FileStagingRequirements string
|
|
||||||
StageSelectionTooltip string
|
StageSelectionTooltip string
|
||||||
DiscardSelection string
|
DiscardSelection string
|
||||||
DiscardSelectionTooltip string
|
DiscardSelectionTooltip string
|
||||||
@@ -359,7 +350,6 @@ type TranslationSet struct {
|
|||||||
FwdCommitsToPush string
|
FwdCommitsToPush string
|
||||||
PullRequestNoUpstream string
|
PullRequestNoUpstream string
|
||||||
ErrorOccurred string
|
ErrorOccurred string
|
||||||
NoRoom string
|
|
||||||
ConflictLabel string
|
ConflictLabel string
|
||||||
PendingRebaseTodosSectionHeader string
|
PendingRebaseTodosSectionHeader string
|
||||||
PendingCherryPicksSectionHeader string
|
PendingCherryPicksSectionHeader string
|
||||||
@@ -373,16 +363,12 @@ type TranslationSet struct {
|
|||||||
DroppingMergeRequiresSingleSelection string
|
DroppingMergeRequiresSingleSelection string
|
||||||
CherryPickCopy string
|
CherryPickCopy string
|
||||||
CherryPickCopyTooltip string
|
CherryPickCopyTooltip string
|
||||||
CherryPickCopyRangeTooltip string
|
|
||||||
PasteCommits string
|
PasteCommits string
|
||||||
SureCherryPick string
|
SureCherryPick string
|
||||||
CherryPick string
|
CherryPick string
|
||||||
CannotCherryPickNonCommit string
|
CannotCherryPickNonCommit string
|
||||||
CannotCherryPickMergeCommit string
|
|
||||||
Donate string
|
Donate string
|
||||||
AskQuestion string
|
AskQuestion string
|
||||||
PrevLine string
|
|
||||||
NextLine string
|
|
||||||
PrevHunk string
|
PrevHunk string
|
||||||
NextHunk string
|
NextHunk string
|
||||||
PrevConflict string
|
PrevConflict string
|
||||||
@@ -431,7 +417,6 @@ type TranslationSet struct {
|
|||||||
CommitFilesDynamicTitle string
|
CommitFilesDynamicTitle string
|
||||||
RemoteBranchesDynamicTitle string
|
RemoteBranchesDynamicTitle string
|
||||||
ViewItemFiles string
|
ViewItemFiles string
|
||||||
ViewItemFilesTooltip string
|
|
||||||
CommitFilesTitle string
|
CommitFilesTitle string
|
||||||
CheckoutCommitFileTooltip string
|
CheckoutCommitFileTooltip string
|
||||||
CanOnlyDiscardFromLocalCommits string
|
CanOnlyDiscardFromLocalCommits string
|
||||||
@@ -508,8 +493,6 @@ type TranslationSet struct {
|
|||||||
StashOptions string
|
StashOptions string
|
||||||
NotARepository string
|
NotARepository string
|
||||||
WorkingDirectoryDoesNotExist string
|
WorkingDirectoryDoesNotExist string
|
||||||
Jump string
|
|
||||||
ScrollLeftRight string
|
|
||||||
ScrollLeft string
|
ScrollLeft string
|
||||||
ScrollRight string
|
ScrollRight string
|
||||||
DiscardPatch string
|
DiscardPatch string
|
||||||
@@ -530,7 +513,6 @@ type TranslationSet struct {
|
|||||||
ExitFocusedMainView string
|
ExitFocusedMainView string
|
||||||
EnterUpstream string
|
EnterUpstream string
|
||||||
InvalidUpstream string
|
InvalidUpstream string
|
||||||
ReturnToRemotesList string
|
|
||||||
NewRemote string
|
NewRemote string
|
||||||
NewRemoteName string
|
NewRemoteName string
|
||||||
NewRemoteUrl string
|
NewRemoteUrl string
|
||||||
@@ -564,7 +546,6 @@ type TranslationSet struct {
|
|||||||
EditRemoteTooltip string
|
EditRemoteTooltip string
|
||||||
TagCommit string
|
TagCommit string
|
||||||
TagCommitTooltip string
|
TagCommitTooltip string
|
||||||
TagMenuTitle string
|
|
||||||
TagNameTitle string
|
TagNameTitle string
|
||||||
TagMessageTitle string
|
TagMessageTitle string
|
||||||
LightweightTag string
|
LightweightTag string
|
||||||
@@ -586,11 +567,8 @@ type TranslationSet struct {
|
|||||||
ForceTag string
|
ForceTag string
|
||||||
ForceTagPrompt string
|
ForceTagPrompt string
|
||||||
FetchRemoteTooltip string
|
FetchRemoteTooltip string
|
||||||
FetchingRemoteStatus string
|
|
||||||
CheckoutCommit string
|
|
||||||
CheckoutCommitTooltip string
|
CheckoutCommitTooltip string
|
||||||
NoBranchesFoundAtCommitTooltip string
|
NoBranchesFoundAtCommitTooltip string
|
||||||
SureCheckoutThisCommit string
|
|
||||||
GitFlowOptions string
|
GitFlowOptions string
|
||||||
NotAGitFlowBranch string
|
NotAGitFlowBranch string
|
||||||
NewBranchNamePrompt string
|
NewBranchNamePrompt string
|
||||||
@@ -603,7 +581,6 @@ type TranslationSet struct {
|
|||||||
PrevScreenMode string
|
PrevScreenMode string
|
||||||
StartSearch string
|
StartSearch string
|
||||||
StartFilter string
|
StartFilter string
|
||||||
Panel string
|
|
||||||
Keybindings string
|
Keybindings string
|
||||||
KeybindingsLegend string
|
KeybindingsLegend string
|
||||||
KeybindingsMenuSectionLocal string
|
KeybindingsMenuSectionLocal string
|
||||||
@@ -611,7 +588,6 @@ type TranslationSet struct {
|
|||||||
KeybindingsMenuSectionNavigation string
|
KeybindingsMenuSectionNavigation string
|
||||||
RenameBranch string
|
RenameBranch string
|
||||||
Upstream string
|
Upstream string
|
||||||
UpstreamTooltip string
|
|
||||||
BranchUpstreamOptionsTitle string
|
BranchUpstreamOptionsTitle string
|
||||||
ViewBranchUpstreamOptions string
|
ViewBranchUpstreamOptions string
|
||||||
ViewBranchUpstreamOptionsTooltip string
|
ViewBranchUpstreamOptionsTooltip string
|
||||||
@@ -662,7 +638,6 @@ type TranslationSet struct {
|
|||||||
CopyCommitHashToClipboard string
|
CopyCommitHashToClipboard string
|
||||||
CommitHash string
|
CommitHash string
|
||||||
CommitURL string
|
CommitURL string
|
||||||
CopyCommitMessageToClipboard string
|
|
||||||
PasteCommitMessageFromClipboard string
|
PasteCommitMessageFromClipboard string
|
||||||
SurePasteCommitMessage string
|
SurePasteCommitMessage string
|
||||||
CommitMessage string
|
CommitMessage string
|
||||||
@@ -727,7 +702,6 @@ type TranslationSet struct {
|
|||||||
SuggestionsTitle string
|
SuggestionsTitle string
|
||||||
SuggestionsSubtitle string
|
SuggestionsSubtitle string
|
||||||
ExtrasTitle string
|
ExtrasTitle string
|
||||||
PushingTagStatus string
|
|
||||||
PullRequestURLCopiedToClipboard string
|
PullRequestURLCopiedToClipboard string
|
||||||
CommitDiffCopiedToClipboard string
|
CommitDiffCopiedToClipboard string
|
||||||
CommitURLCopiedToClipboard string
|
CommitURLCopiedToClipboard string
|
||||||
@@ -925,11 +899,7 @@ type Bisect struct {
|
|||||||
|
|
||||||
type Log struct {
|
type Log struct {
|
||||||
EditRebase string
|
EditRebase string
|
||||||
MoveCommitUp string
|
|
||||||
MoveCommitDown string
|
|
||||||
CherryPickCommits string
|
|
||||||
HandleUndo string
|
HandleUndo string
|
||||||
HandleMidRebaseCommand string
|
|
||||||
RemoveFile string
|
RemoveFile string
|
||||||
CopyToClipboard string
|
CopyToClipboard string
|
||||||
Remove string
|
Remove string
|
||||||
@@ -939,128 +909,122 @@ type Log struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Actions struct {
|
type Actions struct {
|
||||||
CheckoutCommit string
|
CheckoutCommit string
|
||||||
CheckoutBranchAtCommit string
|
CheckoutBranchAtCommit string
|
||||||
CheckoutCommitAsDetachedHead string
|
CheckoutCommitAsDetachedHead string
|
||||||
CheckoutTag string
|
CheckoutTag string
|
||||||
CheckoutBranch string
|
CheckoutBranch string
|
||||||
CheckoutBranchOrCommit string
|
CheckoutBranchOrCommit string
|
||||||
ForceCheckoutBranch string
|
ForceCheckoutBranch string
|
||||||
DeleteLocalBranch string
|
DeleteLocalBranch string
|
||||||
Merge string
|
Merge string
|
||||||
SquashMerge string
|
SquashMerge string
|
||||||
RebaseBranch string
|
RebaseBranch string
|
||||||
RenameBranch string
|
RenameBranch string
|
||||||
CreateBranch string
|
CreateBranch string
|
||||||
FastForwardBranch string
|
FastForwardBranch string
|
||||||
AutoForwardBranches string
|
AutoForwardBranches string
|
||||||
CherryPick string
|
CherryPick string
|
||||||
CheckoutFile string
|
CheckoutFile string
|
||||||
DiscardOldFileChange string
|
SquashCommitDown string
|
||||||
SquashCommitDown string
|
FixupCommit string
|
||||||
FixupCommit string
|
RewordCommit string
|
||||||
RewordCommit string
|
DropCommit string
|
||||||
DropCommit string
|
EditCommit string
|
||||||
EditCommit string
|
AmendCommit string
|
||||||
AmendCommit string
|
ResetCommitAuthor string
|
||||||
ResetCommitAuthor string
|
SetCommitAuthor string
|
||||||
SetCommitAuthor string
|
AddCommitCoAuthor string
|
||||||
AddCommitCoAuthor string
|
RevertCommit string
|
||||||
RevertCommit string
|
CreateFixupCommit string
|
||||||
CreateFixupCommit string
|
SquashAllAboveFixupCommits string
|
||||||
SquashAllAboveFixupCommits string
|
MoveCommitUp string
|
||||||
MoveCommitUp string
|
MoveCommitDown string
|
||||||
MoveCommitDown string
|
CopyCommitMessageToClipboard string
|
||||||
CopyCommitMessageToClipboard string
|
CopyCommitMessageBodyToClipboard string
|
||||||
CopyCommitMessageBodyToClipboard string
|
CopyCommitSubjectToClipboard string
|
||||||
CopyCommitSubjectToClipboard string
|
CopyCommitDiffToClipboard string
|
||||||
CopyCommitDiffToClipboard string
|
CopyCommitHashToClipboard string
|
||||||
CopyCommitHashToClipboard string
|
CopyCommitURLToClipboard string
|
||||||
CopyCommitURLToClipboard string
|
CopyCommitAuthorToClipboard string
|
||||||
CopyCommitAuthorToClipboard string
|
CopyCommitAttributeToClipboard string
|
||||||
CopyCommitAttributeToClipboard string
|
CopyCommitTagsToClipboard string
|
||||||
CopyCommitTagsToClipboard string
|
CopyPatchToClipboard string
|
||||||
CopyPatchToClipboard string
|
CustomCommand string
|
||||||
CustomCommand string
|
DiscardAllChangesInFile string
|
||||||
DiscardAllChangesInDirectory string
|
DiscardAllUnstagedChangesInFile string
|
||||||
DiscardUnstagedChangesInDirectory string
|
StageFile string
|
||||||
DiscardAllChangesInFile string
|
StageResolvedFiles string
|
||||||
DiscardAllUnstagedChangesInFile string
|
UnstageFile string
|
||||||
StageFile string
|
UnstageAllFiles string
|
||||||
StageResolvedFiles string
|
StageAllFiles string
|
||||||
UnstageFile string
|
ResolveConflictByKeepingFile string
|
||||||
UnstageAllFiles string
|
ResolveConflictByDeletingFile string
|
||||||
StageAllFiles string
|
NotEnoughContextToStage string
|
||||||
ResolveConflictByKeepingFile string
|
NotEnoughContextToDiscard string
|
||||||
ResolveConflictByDeletingFile string
|
NotEnoughContextForCustomPatch string
|
||||||
NotEnoughContextToStage string
|
IgnoreExcludeFile string
|
||||||
NotEnoughContextToDiscard string
|
IgnoreFileErr string
|
||||||
NotEnoughContextForCustomPatch string
|
ExcludeFile string
|
||||||
IgnoreExcludeFile string
|
ExcludeGitIgnoreErr string
|
||||||
IgnoreFileErr string
|
Commit string
|
||||||
ExcludeFile string
|
Push string
|
||||||
ExcludeGitIgnoreErr string
|
Pull string
|
||||||
Commit string
|
OpenFile string
|
||||||
EditFile string
|
StashAllChanges string
|
||||||
Push string
|
StashAllChangesKeepIndex string
|
||||||
Pull string
|
StashStagedChanges string
|
||||||
OpenFile string
|
StashUnstagedChanges string
|
||||||
StashAllChanges string
|
StashIncludeUntrackedChanges string
|
||||||
StashAllChangesKeepIndex string
|
GitFlowFinish string
|
||||||
StashStagedChanges string
|
GitFlowStart string
|
||||||
StashUnstagedChanges string
|
CopyToClipboard string
|
||||||
StashIncludeUntrackedChanges string
|
CopySelectedTextToClipboard string
|
||||||
GitFlowFinish string
|
RemovePatchFromCommit string
|
||||||
GitFlowStart string
|
MovePatchToSelectedCommit string
|
||||||
CopyToClipboard string
|
MovePatchIntoIndex string
|
||||||
CopySelectedTextToClipboard string
|
MovePatchIntoNewCommit string
|
||||||
RemovePatchFromCommit string
|
DeleteRemoteBranch string
|
||||||
MovePatchToSelectedCommit string
|
SetBranchUpstream string
|
||||||
MovePatchIntoIndex string
|
AddRemote string
|
||||||
MovePatchIntoNewCommit string
|
RemoveRemote string
|
||||||
DeleteRemoteBranch string
|
UpdateRemote string
|
||||||
SetBranchUpstream string
|
ApplyPatch string
|
||||||
AddRemote string
|
Stash string
|
||||||
RemoveRemote string
|
RenameStash string
|
||||||
UpdateRemote string
|
RemoveSubmodule string
|
||||||
ApplyPatch string
|
ResetSubmodule string
|
||||||
Stash string
|
AddSubmodule string
|
||||||
RenameStash string
|
UpdateSubmoduleUrl string
|
||||||
RemoveSubmodule string
|
InitialiseSubmodule string
|
||||||
ResetSubmodule string
|
BulkInitialiseSubmodules string
|
||||||
AddSubmodule string
|
BulkUpdateSubmodules string
|
||||||
UpdateSubmoduleUrl string
|
BulkDeinitialiseSubmodules string
|
||||||
InitialiseSubmodule string
|
BulkUpdateRecursiveSubmodules string
|
||||||
BulkInitialiseSubmodules string
|
UpdateSubmodule string
|
||||||
BulkUpdateSubmodules string
|
CreateLightweightTag string
|
||||||
BulkDeinitialiseSubmodules string
|
CreateAnnotatedTag string
|
||||||
BulkUpdateRecursiveSubmodules string
|
DeleteLocalTag string
|
||||||
UpdateSubmodule string
|
DeleteRemoteTag string
|
||||||
CreateLightweightTag string
|
PushTag string
|
||||||
CreateAnnotatedTag string
|
NukeWorkingTree string
|
||||||
DeleteLocalTag string
|
DiscardUnstagedFileChanges string
|
||||||
DeleteRemoteTag string
|
RemoveUntrackedFiles string
|
||||||
PushTag string
|
RemoveStagedFiles string
|
||||||
NukeWorkingTree string
|
SoftReset string
|
||||||
DiscardUnstagedFileChanges string
|
MixedReset string
|
||||||
RemoveUntrackedFiles string
|
HardReset string
|
||||||
RemoveStagedFiles string
|
Undo string
|
||||||
SoftReset string
|
Redo string
|
||||||
MixedReset string
|
CopyPullRequestURL string
|
||||||
HardReset string
|
OpenMergeTool string
|
||||||
Undo string
|
OpenCommitInBrowser string
|
||||||
Redo string
|
OpenPullRequest string
|
||||||
CopyPullRequestURL string
|
StartBisect string
|
||||||
OpenDiffTool string
|
ResetBisect string
|
||||||
OpenMergeTool string
|
BisectSkip string
|
||||||
OpenCommitInBrowser string
|
BisectMark string
|
||||||
OpenPullRequest string
|
AddWorktree string
|
||||||
StartBisect string
|
|
||||||
ResetBisect string
|
|
||||||
BisectSkip string
|
|
||||||
BisectMark string
|
|
||||||
RemoveWorktree string
|
|
||||||
AddWorktree string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const englishIntroPopupMessage = `
|
const englishIntroPopupMessage = `
|
||||||
@@ -1114,7 +1078,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
EasterEgg: "Easter egg",
|
EasterEgg: "Easter egg",
|
||||||
UnstagedChanges: "Unstaged changes",
|
UnstagedChanges: "Unstaged changes",
|
||||||
StagedChanges: "Staged changes",
|
StagedChanges: "Staged changes",
|
||||||
MainTitle: "Main",
|
|
||||||
SquashMergeUncommittedTitle: "Squash merge and leave uncommitted",
|
SquashMergeUncommittedTitle: "Squash merge and leave uncommitted",
|
||||||
SquashMergeCommittedTitle: "Squash merge and commit",
|
SquashMergeCommittedTitle: "Squash merge and commit",
|
||||||
StagingTitle: "Main panel (staging)",
|
StagingTitle: "Main panel (staging)",
|
||||||
@@ -1144,7 +1107,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
BaseCommitIsNotInCurrentView: "Base commit is not in current view",
|
BaseCommitIsNotInCurrentView: "Base commit is not in current view",
|
||||||
HunksWithOnlyAddedLinesWarning: "There are ranges of only added lines in the diff; be careful to check that these belong in the found base commit.\n\nProceed?",
|
HunksWithOnlyAddedLinesWarning: "There are ranges of only added lines in the diff; be careful to check that these belong in the found base commit.\n\nProceed?",
|
||||||
StatusTitle: "Status",
|
StatusTitle: "Status",
|
||||||
Menu: "Menu",
|
|
||||||
Execute: "Execute",
|
Execute: "Execute",
|
||||||
Stage: "Stage",
|
Stage: "Stage",
|
||||||
StageTooltip: "Toggle staged for selected file.",
|
StageTooltip: "Toggle staged for selected file.",
|
||||||
@@ -1161,7 +1123,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
PushTooltip: "Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch.",
|
PushTooltip: "Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch.",
|
||||||
Pull: "Pull",
|
Pull: "Pull",
|
||||||
PullTooltip: "Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch.",
|
PullTooltip: "Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch.",
|
||||||
Scroll: "Scroll",
|
|
||||||
MergeConflictsTitle: "Merge conflicts",
|
MergeConflictsTitle: "Merge conflicts",
|
||||||
MergeConflictDescription_DD: "Conflict: this file was moved or renamed both in the current and the incoming changes, but to different destinations. I don't know which ones, but they should both show up as conflicts too (marked 'AU' and 'UA', respectively). The most likely resolution is to delete this file, and pick one of the destinations and delete the other.",
|
MergeConflictDescription_DD: "Conflict: this file was moved or renamed both in the current and the incoming changes, but to different destinations. I don't know which ones, but they should both show up as conflicts too (marked 'AU' and 'UA', respectively). The most likely resolution is to delete this file, and pick one of the destinations and delete the other.",
|
||||||
MergeConflictDescription_AU: "Conflict: this file is the destination of a move or rename in the current changes, but was moved or renamed to a different destination in the incoming changes. That other destination should also show up as a conflict (marked 'UA'), as well as the file that both were renamed from (marked 'DD').",
|
MergeConflictDescription_AU: "Conflict: this file is the destination of a move or rename in the current changes, but was moved or renamed to a different destination in the incoming changes. That other destination should also show up as a conflict (marked 'UA'), as well as the file that both were renamed from (marked 'DD').",
|
||||||
@@ -1216,7 +1177,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
DeleteBranchesTitle: "Delete selected branches?",
|
DeleteBranchesTitle: "Delete selected branches?",
|
||||||
DeleteLocalBranch: "Delete local branch",
|
DeleteLocalBranch: "Delete local branch",
|
||||||
DeleteLocalBranches: "Delete local branches",
|
DeleteLocalBranches: "Delete local branches",
|
||||||
DeleteRemoteBranchOption: "Delete remote branch",
|
|
||||||
DeleteRemoteBranchPrompt: "Are you sure you want to delete the remote branch '{{.selectedBranchName}}' from '{{.upstream}}'?",
|
DeleteRemoteBranchPrompt: "Are you sure you want to delete the remote branch '{{.selectedBranchName}}' from '{{.upstream}}'?",
|
||||||
DeleteRemoteBranchesPrompt: "Are you sure you want to delete the remote branches of the selected branches from their respective remotes?",
|
DeleteRemoteBranchesPrompt: "Are you sure you want to delete the remote branches of the selected branches from their respective remotes?",
|
||||||
DeleteLocalAndRemoteBranchPrompt: "Are you sure you want to delete both '{{.localBranchName}}' from your machine, and '{{.remoteBranchName}}' from '{{.remoteName}}'?",
|
DeleteLocalAndRemoteBranchPrompt: "Are you sure you want to delete both '{{.localBranchName}}' from your machine, and '{{.remoteBranchName}}' from '{{.remoteName}}'?",
|
||||||
@@ -1266,12 +1226,9 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
SureFixupThisCommit: "Are you sure you want to 'fixup' the selected commit(s) 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?",
|
SureSquashThisCommit: "Are you sure you want to squash the selected commit(s) into the commit below?",
|
||||||
Squash: "Squash",
|
Squash: "Squash",
|
||||||
SquashMerge: "Squash Merge",
|
|
||||||
PickCommitTooltip: "Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase.",
|
PickCommitTooltip: "Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase.",
|
||||||
Pick: "Pick",
|
Pick: "Pick",
|
||||||
CantPickDisabledReason: "Cannot pick a commit when not mid-rebase",
|
|
||||||
Edit: "Edit",
|
Edit: "Edit",
|
||||||
RevertCommit: "Revert commit",
|
|
||||||
Revert: "Revert",
|
Revert: "Revert",
|
||||||
RevertCommitTooltip: "Create a revert commit for the selected commit, which applies the selected commit's changes in reverse.",
|
RevertCommitTooltip: "Create a revert commit for the selected commit, which applies the selected commit's changes in reverse.",
|
||||||
Reword: "Reword",
|
Reword: "Reword",
|
||||||
@@ -1296,7 +1253,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
SetAuthorPromptTitle: "Set author (must look like 'Name <Email>')",
|
SetAuthorPromptTitle: "Set author (must look like 'Name <Email>')",
|
||||||
AddCoAuthorPromptTitle: "Add co-author (must look like 'Name <Email>')",
|
AddCoAuthorPromptTitle: "Add co-author (must look like 'Name <Email>')",
|
||||||
AddCoAuthorTooltip: "Add co-author using the Github/Gitlab metadata Co-authored-by.",
|
AddCoAuthorTooltip: "Add co-author using the Github/Gitlab metadata Co-authored-by.",
|
||||||
SureResetCommitAuthor: "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?",
|
|
||||||
RewordCommitEditor: "Reword with editor",
|
RewordCommitEditor: "Reword with editor",
|
||||||
Error: "Error",
|
Error: "Error",
|
||||||
PickHunk: "Pick hunk",
|
PickHunk: "Pick hunk",
|
||||||
@@ -1384,7 +1340,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
DisabledInFlatView: "Not available in flat view",
|
DisabledInFlatView: "Not available in flat view",
|
||||||
FileEnter: `Stage lines / Collapse directory`,
|
FileEnter: `Stage lines / Collapse directory`,
|
||||||
FileEnterTooltip: "If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it.",
|
FileEnterTooltip: "If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it.",
|
||||||
FileStagingRequirements: `Can only stage individual lines for tracked files`,
|
|
||||||
StageSelectionTooltip: `Toggle selection staged / unstaged.`,
|
StageSelectionTooltip: `Toggle selection staged / unstaged.`,
|
||||||
DiscardSelection: `Discard`,
|
DiscardSelection: `Discard`,
|
||||||
DiscardSelectionTooltip: "When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change.",
|
DiscardSelectionTooltip: "When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change.",
|
||||||
@@ -1457,7 +1412,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
FwdCommitsToPush: "Cannot fast-forward a branch with commits to push",
|
FwdCommitsToPush: "Cannot fast-forward a branch with commits to push",
|
||||||
PullRequestNoUpstream: "Cannot open a pull request for a branch with no upstream",
|
PullRequestNoUpstream: "Cannot open a pull request for a branch with no upstream",
|
||||||
ErrorOccurred: "An error occurred! Please create an issue at",
|
ErrorOccurred: "An error occurred! Please create an issue at",
|
||||||
NoRoom: "Not enough room",
|
|
||||||
ConflictLabel: "CONFLICT",
|
ConflictLabel: "CONFLICT",
|
||||||
PendingRebaseTodosSectionHeader: "Pending rebase todos",
|
PendingRebaseTodosSectionHeader: "Pending rebase todos",
|
||||||
PendingCherryPicksSectionHeader: "Pending cherry-picks",
|
PendingCherryPicksSectionHeader: "Pending cherry-picks",
|
||||||
@@ -1471,16 +1425,12 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
DroppingMergeRequiresSingleSelection: "Dropping a merge commit requires a single selected item",
|
DroppingMergeRequiresSingleSelection: "Dropping a merge commit requires a single selected item",
|
||||||
CherryPickCopy: "Copy (cherry-pick)",
|
CherryPickCopy: "Copy (cherry-pick)",
|
||||||
CherryPickCopyTooltip: "Mark commit as copied. Then, within the local commits view, you can press `{{.paste}}` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `{{.escape}}` to cancel the selection.",
|
CherryPickCopyTooltip: "Mark commit as copied. Then, within the local commits view, you can press `{{.paste}}` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `{{.escape}}` to cancel the selection.",
|
||||||
CherryPickCopyRangeTooltip: "Mark commits as copied from the last copied commit to the selected commit.",
|
|
||||||
PasteCommits: "Paste (cherry-pick)",
|
PasteCommits: "Paste (cherry-pick)",
|
||||||
SureCherryPick: "Are you sure you want to cherry-pick the {{.numCommits}} copied commit(s) onto this branch?",
|
SureCherryPick: "Are you sure you want to cherry-pick the {{.numCommits}} copied commit(s) onto this branch?",
|
||||||
CherryPick: "Cherry-pick",
|
CherryPick: "Cherry-pick",
|
||||||
CannotCherryPickNonCommit: "Cannot cherry-pick this kind of todo item",
|
CannotCherryPickNonCommit: "Cannot cherry-pick this kind of todo item",
|
||||||
CannotCherryPickMergeCommit: "Cherry-picking merge commits is not supported",
|
|
||||||
Donate: "Donate",
|
Donate: "Donate",
|
||||||
AskQuestion: "Ask Question",
|
AskQuestion: "Ask Question",
|
||||||
PrevLine: "Select previous line",
|
|
||||||
NextLine: "Select next line",
|
|
||||||
PrevHunk: "Go to previous hunk",
|
PrevHunk: "Go to previous hunk",
|
||||||
NextHunk: "Go to next hunk",
|
NextHunk: "Go to next hunk",
|
||||||
PrevConflict: "Previous conflict",
|
PrevConflict: "Previous conflict",
|
||||||
@@ -1529,7 +1479,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
CommitFilesDynamicTitle: "Diff files (%s)",
|
CommitFilesDynamicTitle: "Diff files (%s)",
|
||||||
RemoteBranchesDynamicTitle: "Remote branches (%s)",
|
RemoteBranchesDynamicTitle: "Remote branches (%s)",
|
||||||
ViewItemFiles: "View files",
|
ViewItemFiles: "View files",
|
||||||
ViewItemFilesTooltip: "View the files modified by the selected item.",
|
|
||||||
CommitFilesTitle: "Commit files",
|
CommitFilesTitle: "Commit files",
|
||||||
CheckoutCommitFileTooltip: "Checkout file. This replaces the file in your working tree with the version from the selected commit.",
|
CheckoutCommitFileTooltip: "Checkout file. This replaces the file in your working tree with the version from the selected commit.",
|
||||||
CanOnlyDiscardFromLocalCommits: "Changes can only be discarded from local commits",
|
CanOnlyDiscardFromLocalCommits: "Changes can only be discarded from local commits",
|
||||||
@@ -1607,8 +1556,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
StashOptions: "Stash options",
|
StashOptions: "Stash options",
|
||||||
NotARepository: "Error: must be run inside a git repository",
|
NotARepository: "Error: must be run inside a git repository",
|
||||||
WorkingDirectoryDoesNotExist: "Error: the current working directory does not exist",
|
WorkingDirectoryDoesNotExist: "Error: the current working directory does not exist",
|
||||||
Jump: "Jump to panel",
|
|
||||||
ScrollLeftRight: "Scroll left/right",
|
|
||||||
ScrollLeft: "Scroll left",
|
ScrollLeft: "Scroll left",
|
||||||
ScrollRight: "Scroll right",
|
ScrollRight: "Scroll right",
|
||||||
DiscardPatch: "Discard patch",
|
DiscardPatch: "Discard patch",
|
||||||
@@ -1629,7 +1576,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
ExitFocusedMainView: "Exit back to side panel",
|
ExitFocusedMainView: "Exit back to side panel",
|
||||||
EnterUpstream: `Enter upstream as '<remote> <branchname>'`,
|
EnterUpstream: `Enter upstream as '<remote> <branchname>'`,
|
||||||
InvalidUpstream: "Invalid upstream. Must be in the format '<remote> <branchname>'",
|
InvalidUpstream: "Invalid upstream. Must be in the format '<remote> <branchname>'",
|
||||||
ReturnToRemotesList: `Return to remotes list`,
|
|
||||||
NewRemote: `New remote`,
|
NewRemote: `New remote`,
|
||||||
NewRemoteName: `New remote name:`,
|
NewRemoteName: `New remote name:`,
|
||||||
NewRemoteUrl: `New remote url:`,
|
NewRemoteUrl: `New remote url:`,
|
||||||
@@ -1663,7 +1609,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
EditRemoteTooltip: "Edit the selected remote's name or URL.",
|
EditRemoteTooltip: "Edit the selected remote's name or URL.",
|
||||||
TagCommit: "Tag commit",
|
TagCommit: "Tag commit",
|
||||||
TagCommitTooltip: "Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description.",
|
TagCommitTooltip: "Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description.",
|
||||||
TagMenuTitle: "Create tag",
|
|
||||||
TagNameTitle: "Tag name",
|
TagNameTitle: "Tag name",
|
||||||
TagMessageTitle: "Tag description",
|
TagMessageTitle: "Tag description",
|
||||||
AnnotatedTag: "Annotated tag",
|
AnnotatedTag: "Annotated tag",
|
||||||
@@ -1686,11 +1631,8 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
ForceTag: "Force Tag",
|
ForceTag: "Force Tag",
|
||||||
ForceTagPrompt: "The tag '{{.tagName}}' exists already. Press {{.cancelKey}} to cancel, or {{.confirmKey}} to overwrite.",
|
ForceTagPrompt: "The tag '{{.tagName}}' exists already. Press {{.cancelKey}} to cancel, or {{.confirmKey}} to overwrite.",
|
||||||
FetchRemoteTooltip: "Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches.",
|
FetchRemoteTooltip: "Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches.",
|
||||||
FetchingRemoteStatus: "Fetching remote",
|
|
||||||
CheckoutCommit: "Checkout commit",
|
|
||||||
CheckoutCommitTooltip: "Checkout the selected commit as a detached HEAD.",
|
CheckoutCommitTooltip: "Checkout the selected commit as a detached HEAD.",
|
||||||
NoBranchesFoundAtCommitTooltip: "No branches found at selected commit.",
|
NoBranchesFoundAtCommitTooltip: "No branches found at selected commit.",
|
||||||
SureCheckoutThisCommit: "Are you sure you want to checkout this commit?",
|
|
||||||
GitFlowOptions: "Show git-flow options",
|
GitFlowOptions: "Show git-flow options",
|
||||||
NotAGitFlowBranch: "This does not seem to be a git flow branch",
|
NotAGitFlowBranch: "This does not seem to be a git flow branch",
|
||||||
NewGitFlowBranchPrompt: "New {{.branchType}} name:",
|
NewGitFlowBranchPrompt: "New {{.branchType}} name:",
|
||||||
@@ -1704,7 +1646,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
PrevScreenMode: "Prev screen mode",
|
PrevScreenMode: "Prev screen mode",
|
||||||
StartSearch: "Search the current view by text",
|
StartSearch: "Search the current view by text",
|
||||||
StartFilter: "Filter the current view by text",
|
StartFilter: "Filter the current view by text",
|
||||||
Panel: "Panel",
|
|
||||||
KeybindingsLegend: "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
|
KeybindingsLegend: "Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b",
|
||||||
RenameBranch: "Rename branch",
|
RenameBranch: "Rename branch",
|
||||||
BranchUpstreamOptionsTitle: "Upstream options",
|
BranchUpstreamOptionsTitle: "Upstream options",
|
||||||
@@ -1713,7 +1654,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
UpstreamNotSetError: "The selected branch has no upstream (or the upstream is not stored locally)",
|
UpstreamNotSetError: "The selected branch has no upstream (or the upstream is not stored locally)",
|
||||||
UpstreamsNotSetError: "Some of the selected branches have no upstream (or the upstream is not stored locally)",
|
UpstreamsNotSetError: "Some of the selected branches have no upstream (or the upstream is not stored locally)",
|
||||||
Upstream: "Upstream",
|
Upstream: "Upstream",
|
||||||
UpstreamTooltip: "View upstream options for selected branch e.g. setting/unsetting the upstream and resetting to the upstream.",
|
|
||||||
NewBranchNamePrompt: "Enter new branch name for branch",
|
NewBranchNamePrompt: "Enter new branch name for branch",
|
||||||
RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
|
RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
|
||||||
OpenKeybindingsMenu: "Open keybindings menu",
|
OpenKeybindingsMenu: "Open keybindings menu",
|
||||||
@@ -1760,7 +1700,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
CopyCommitHashToClipboard: "Copy commit hash to clipboard",
|
CopyCommitHashToClipboard: "Copy commit hash to clipboard",
|
||||||
CommitHash: "Commit hash",
|
CommitHash: "Commit hash",
|
||||||
CommitURL: "Commit URL",
|
CommitURL: "Commit URL",
|
||||||
CopyCommitMessageToClipboard: "Copy commit message to clipboard",
|
|
||||||
PasteCommitMessageFromClipboard: "Paste commit message from clipboard",
|
PasteCommitMessageFromClipboard: "Paste commit message from clipboard",
|
||||||
SurePasteCommitMessage: "Pasting will overwrite the current commit message, continue?",
|
SurePasteCommitMessage: "Pasting will overwrite the current commit message, continue?",
|
||||||
CommitMessage: "Commit message (subject and body)",
|
CommitMessage: "Commit message (subject and body)",
|
||||||
@@ -1824,7 +1763,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
SuggestionsTitle: "Suggestions (press %s to focus)",
|
SuggestionsTitle: "Suggestions (press %s to focus)",
|
||||||
SuggestionsSubtitle: "(press %s to delete, %s to edit)",
|
SuggestionsSubtitle: "(press %s to delete, %s to edit)",
|
||||||
ExtrasTitle: "Command log",
|
ExtrasTitle: "Command log",
|
||||||
PushingTagStatus: "Pushing tag",
|
|
||||||
PullRequestURLCopiedToClipboard: "Pull request URL copied to clipboard",
|
PullRequestURLCopiedToClipboard: "Pull request URL copied to clipboard",
|
||||||
CommitDiffCopiedToClipboard: "Commit diff copied to clipboard",
|
CommitDiffCopiedToClipboard: "Commit diff copied to clipboard",
|
||||||
CommitURLCopiedToClipboard: "Commit URL copied to clipboard",
|
CommitURLCopiedToClipboard: "Commit URL copied to clipboard",
|
||||||
@@ -2010,7 +1948,6 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
CreateBranch: "Create branch",
|
CreateBranch: "Create branch",
|
||||||
CherryPick: "(Cherry-pick) paste commits",
|
CherryPick: "(Cherry-pick) paste commits",
|
||||||
CheckoutFile: "Checkout file",
|
CheckoutFile: "Checkout file",
|
||||||
DiscardOldFileChange: "Discard old file change",
|
|
||||||
SquashCommitDown: "Squash commit down",
|
SquashCommitDown: "Squash commit down",
|
||||||
FixupCommit: "Fixup commit",
|
FixupCommit: "Fixup commit",
|
||||||
RewordCommit: "Reword commit",
|
RewordCommit: "Reword commit",
|
||||||
@@ -2038,88 +1975,80 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
MoveCommitUp: "Move commit up",
|
MoveCommitUp: "Move commit up",
|
||||||
MoveCommitDown: "Move commit down",
|
MoveCommitDown: "Move commit down",
|
||||||
CustomCommand: "Custom command",
|
CustomCommand: "Custom command",
|
||||||
|
DiscardAllChangesInFile: "Discard all changes in selected file(s)",
|
||||||
// TODO: remove
|
DiscardAllUnstagedChangesInFile: "Discard all unstaged changes selected file(s)",
|
||||||
DiscardAllChangesInDirectory: "Discard all changes in directory",
|
StageFile: "Stage file",
|
||||||
DiscardUnstagedChangesInDirectory: "Discard unstaged changes in directory",
|
StageResolvedFiles: "Stage files whose merge conflicts were resolved",
|
||||||
|
UnstageFile: "Unstage file",
|
||||||
DiscardAllChangesInFile: "Discard all changes in selected file(s)",
|
UnstageAllFiles: "Unstage all files",
|
||||||
DiscardAllUnstagedChangesInFile: "Discard all unstaged changes selected file(s)",
|
StageAllFiles: "Stage all files",
|
||||||
StageFile: "Stage file",
|
ResolveConflictByKeepingFile: "Resolve by keeping file",
|
||||||
StageResolvedFiles: "Stage files whose merge conflicts were resolved",
|
ResolveConflictByDeletingFile: "Resolve by deleting file",
|
||||||
UnstageFile: "Unstage file",
|
NotEnoughContextToStage: "Staging or unstaging changes is not possible with a diff context size of 0. Increase the context using '%s'.",
|
||||||
UnstageAllFiles: "Unstage all files",
|
NotEnoughContextToDiscard: "Discarding changes is not possible with a diff context size of 0. Increase the context using '%s'.",
|
||||||
StageAllFiles: "Stage all files",
|
NotEnoughContextForCustomPatch: "Creating custom patches is not possible with a diff context size of 0. Increase the context using '%s'.",
|
||||||
ResolveConflictByKeepingFile: "Resolve by keeping file",
|
IgnoreExcludeFile: "Ignore or exclude file",
|
||||||
ResolveConflictByDeletingFile: "Resolve by deleting file",
|
IgnoreFileErr: "Cannot ignore .gitignore",
|
||||||
NotEnoughContextToStage: "Staging or unstaging changes is not possible with a diff context size of 0. Increase the context using '%s'.",
|
ExcludeFile: "Exclude file",
|
||||||
NotEnoughContextToDiscard: "Discarding changes is not possible with a diff context size of 0. Increase the context using '%s'.",
|
ExcludeGitIgnoreErr: "Cannot exclude .gitignore",
|
||||||
NotEnoughContextForCustomPatch: "Creating custom patches is not possible with a diff context size of 0. Increase the context using '%s'.",
|
Commit: "Commit",
|
||||||
IgnoreExcludeFile: "Ignore or exclude file",
|
Push: "Push",
|
||||||
IgnoreFileErr: "Cannot ignore .gitignore",
|
Pull: "Pull",
|
||||||
ExcludeFile: "Exclude file",
|
OpenFile: "Open file",
|
||||||
ExcludeGitIgnoreErr: "Cannot exclude .gitignore",
|
StashAllChanges: "Stash all changes",
|
||||||
Commit: "Commit",
|
StashAllChangesKeepIndex: "Stash all changes and keep index",
|
||||||
EditFile: "Edit file",
|
StashStagedChanges: "Stash staged changes",
|
||||||
Push: "Push",
|
StashUnstagedChanges: "Stash unstaged changes",
|
||||||
Pull: "Pull",
|
StashIncludeUntrackedChanges: "Stash all changes including untracked files",
|
||||||
OpenFile: "Open file",
|
GitFlowFinish: "git flow finish",
|
||||||
StashAllChanges: "Stash all changes",
|
GitFlowStart: "git flow start",
|
||||||
StashAllChangesKeepIndex: "Stash all changes and keep index",
|
CopyToClipboard: "Copy to clipboard",
|
||||||
StashStagedChanges: "Stash staged changes",
|
CopySelectedTextToClipboard: "Copy selected text to clipboard",
|
||||||
StashUnstagedChanges: "Stash unstaged changes",
|
RemovePatchFromCommit: "Remove patch from commit",
|
||||||
StashIncludeUntrackedChanges: "Stash all changes including untracked files",
|
MovePatchToSelectedCommit: "Move patch to selected commit",
|
||||||
GitFlowFinish: "git flow finish",
|
MovePatchIntoIndex: "Move patch into index",
|
||||||
GitFlowStart: "git flow start",
|
MovePatchIntoNewCommit: "Move patch into new commit",
|
||||||
CopyToClipboard: "Copy to clipboard",
|
DeleteRemoteBranch: "Delete remote branch",
|
||||||
CopySelectedTextToClipboard: "Copy selected text to clipboard",
|
SetBranchUpstream: "Set branch upstream",
|
||||||
RemovePatchFromCommit: "Remove patch from commit",
|
AddRemote: "Add remote",
|
||||||
MovePatchToSelectedCommit: "Move patch to selected commit",
|
RemoveRemote: "Remove remote",
|
||||||
MovePatchIntoIndex: "Move patch into index",
|
UpdateRemote: "Update remote",
|
||||||
MovePatchIntoNewCommit: "Move patch into new commit",
|
ApplyPatch: "Apply patch",
|
||||||
DeleteRemoteBranch: "Delete remote branch",
|
Stash: "Stash",
|
||||||
SetBranchUpstream: "Set branch upstream",
|
RenameStash: "Rename stash",
|
||||||
AddRemote: "Add remote",
|
RemoveSubmodule: "Remove submodule",
|
||||||
RemoveRemote: "Remove remote",
|
ResetSubmodule: "Reset submodule",
|
||||||
UpdateRemote: "Update remote",
|
AddSubmodule: "Add submodule",
|
||||||
ApplyPatch: "Apply patch",
|
UpdateSubmoduleUrl: "Update submodule URL",
|
||||||
Stash: "Stash",
|
InitialiseSubmodule: "Initialise submodule",
|
||||||
RenameStash: "Rename stash",
|
BulkInitialiseSubmodules: "Bulk initialise submodules",
|
||||||
RemoveSubmodule: "Remove submodule",
|
BulkUpdateSubmodules: "Bulk update submodules",
|
||||||
ResetSubmodule: "Reset submodule",
|
BulkDeinitialiseSubmodules: "Bulk deinitialise submodules",
|
||||||
AddSubmodule: "Add submodule",
|
BulkUpdateRecursiveSubmodules: "Bulk initialise and update submodules recursively",
|
||||||
UpdateSubmoduleUrl: "Update submodule URL",
|
UpdateSubmodule: "Update submodule",
|
||||||
InitialiseSubmodule: "Initialise submodule",
|
DeleteLocalTag: "Delete local tag",
|
||||||
BulkInitialiseSubmodules: "Bulk initialise submodules",
|
DeleteRemoteTag: "Delete remote tag",
|
||||||
BulkUpdateSubmodules: "Bulk update submodules",
|
PushTag: "Push tag",
|
||||||
BulkDeinitialiseSubmodules: "Bulk deinitialise submodules",
|
NukeWorkingTree: "Nuke working tree",
|
||||||
BulkUpdateRecursiveSubmodules: "Bulk initialise and update submodules recursively",
|
DiscardUnstagedFileChanges: "Discard unstaged file changes",
|
||||||
UpdateSubmodule: "Update submodule",
|
RemoveUntrackedFiles: "Remove untracked files",
|
||||||
DeleteLocalTag: "Delete local tag",
|
RemoveStagedFiles: "Remove staged files",
|
||||||
DeleteRemoteTag: "Delete remote tag",
|
SoftReset: "Soft reset",
|
||||||
PushTag: "Push tag",
|
MixedReset: "Mixed reset",
|
||||||
NukeWorkingTree: "Nuke working tree",
|
HardReset: "Hard reset",
|
||||||
DiscardUnstagedFileChanges: "Discard unstaged file changes",
|
FastForwardBranch: "Fast forward branch",
|
||||||
RemoveUntrackedFiles: "Remove untracked files",
|
AutoForwardBranches: "Auto-forward branches",
|
||||||
RemoveStagedFiles: "Remove staged files",
|
Undo: "Undo",
|
||||||
SoftReset: "Soft reset",
|
Redo: "Redo",
|
||||||
MixedReset: "Mixed reset",
|
CopyPullRequestURL: "Copy pull request URL",
|
||||||
HardReset: "Hard reset",
|
OpenMergeTool: "Open merge tool",
|
||||||
FastForwardBranch: "Fast forward branch",
|
OpenCommitInBrowser: "Open commit in browser",
|
||||||
AutoForwardBranches: "Auto-forward branches",
|
OpenPullRequest: "Open pull request in browser",
|
||||||
Undo: "Undo",
|
StartBisect: "Start bisect",
|
||||||
Redo: "Redo",
|
ResetBisect: "Reset bisect",
|
||||||
CopyPullRequestURL: "Copy pull request URL",
|
BisectSkip: "Bisect skip",
|
||||||
OpenDiffTool: "Open diff tool",
|
BisectMark: "Bisect mark",
|
||||||
OpenMergeTool: "Open merge tool",
|
AddWorktree: "Add worktree",
|
||||||
OpenCommitInBrowser: "Open commit in browser",
|
|
||||||
OpenPullRequest: "Open pull request in browser",
|
|
||||||
StartBisect: "Start bisect",
|
|
||||||
ResetBisect: "Reset bisect",
|
|
||||||
BisectSkip: "Bisect skip",
|
|
||||||
BisectMark: "Bisect mark",
|
|
||||||
RemoveWorktree: "Remove worktree",
|
|
||||||
AddWorktree: "Add worktree",
|
|
||||||
},
|
},
|
||||||
Bisect: Bisect{
|
Bisect: Bisect{
|
||||||
Mark: "Mark current commit (%s) as %s",
|
Mark: "Mark current commit (%s) as %s",
|
||||||
@@ -2140,11 +2069,7 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
},
|
},
|
||||||
Log: Log{
|
Log: Log{
|
||||||
EditRebase: "Beginning interactive rebase at '{{.ref}}'",
|
EditRebase: "Beginning interactive rebase at '{{.ref}}'",
|
||||||
MoveCommitUp: "Moving TODO down: '{{.shortHash}}'",
|
|
||||||
MoveCommitDown: "Moving TODO down: '{{.shortHash}}'",
|
|
||||||
CherryPickCommits: "Cherry-picking commits:\n'{{.commitLines}}'",
|
|
||||||
HandleUndo: "Undoing last conflict resolution",
|
HandleUndo: "Undoing last conflict resolution",
|
||||||
HandleMidRebaseCommand: "Updating rebase action of commit {{.shortHash}} to '{{.action}}'",
|
|
||||||
RemoveFile: "Deleting path '{{.path}}'",
|
RemoveFile: "Deleting path '{{.path}}'",
|
||||||
CopyToClipboard: "Copying '{{.str}}' to clipboard",
|
CopyToClipboard: "Copying '{{.str}}' to clipboard",
|
||||||
Remove: "Removing '{{.filename}}'",
|
Remove: "Removing '{{.filename}}'",
|
||||||
|
Reference in New Issue
Block a user