go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-30 23:57:43 +02:00
Code Issues Releases Activity

Rename texts to be consistent with our conventions

Browse Source
This commit is contained in:
Stefan Haller
2025-10-15 17:37:23 +02:00
parent afbef40258
commit c88381b9ce
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@@ -397,22 +397,22 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e
),
},
{
Label: self.c.Tr.SquashMergeUncommittedTitle,
Label: self.c.Tr.SquashMergeUncommitted,
OnPress: self.SquashMergeUncommitted(refName),
Key: 's',
Tooltip: utils.ResolvePlaceholderString(
self.c.Tr.SquashMergeUncommitted,
self.c.Tr.SquashMergeUncommittedTooltip,
map[string]string{
"selectedBranch": refName,
},
),
},
{
Label: self.c.Tr.SquashMergeCommittedTitle,
Label: self.c.Tr.SquashMergeCommitted,
OnPress: self.SquashMergeCommitted(refName, checkedOutBranchName),
Key: 'S',
Tooltip: utils.ResolvePlaceholderString(
self.c.Tr.SquashMergeCommitted,
self.c.Tr.SquashMergeCommittedTooltip,
map[string]string{
"checkedOutBranch": checkedOutBranchName,
"selectedBranch": refName,

12
pkg/i18n/english.go
View File

@@ -266,10 +266,10 @@ type TranslationSet struct {
MergeBranchTooltip string
RegularMerge string
RegularMergeTooltip string
SquashMergeUncommittedTitle string
SquashMergeUncommitted string
SquashMergeCommittedTitle string
SquashMergeUncommittedTooltip string
SquashMergeCommitted string
SquashMergeCommittedTooltip string
ConfirmQuit string
SwitchRepo string
AllBranchesLogGraph string
@@ -1353,10 +1353,10 @@ func EnglishTranslationSet() *TranslationSet {
MergeBranchTooltip: "View options for merging the selected item into the current branch (regular merge, squash merge)",
RegularMerge: "Regular merge",
RegularMergeTooltip: "Merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'.",
SquashMergeUncommittedTitle: "Squash merge and leave uncommitted",
SquashMergeUncommitted: "Squash merge '{{.selectedBranch}}' into the working tree.",
SquashMergeCommittedTitle: "Squash merge and commit",
SquashMergeCommitted: "Squash merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}' as a single commit.",
SquashMergeUncommitted: "Squash merge and leave uncommitted",
SquashMergeUncommittedTooltip: "Squash merge '{{.selectedBranch}}' into the working tree.",
SquashMergeCommitted: "Squash merge and commit",
SquashMergeCommittedTooltip: "Squash merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}' as a single commit.",
ConfirmQuit: `Are you sure you want to quit?`,
SwitchRepo: `Switch to a recent repo`,
AllBranchesLogGraph: `Show/cycle all branch logs`,