Repository: jesseduffield/lazygit
File: pkg/i18n/english.go (Go)

Code before:
		NewBranchFromStashTooltip:            "Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit.",
		MoveCommitsToNewBranch:               "Move commits to new branch",
		MoveCommitsToNewBranchTooltip:        "Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.\n\nNote that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which).",
		MoveCommitsToNewBranchFromMainPrompt: "This will take all unpushed commits and move them to a new branch (off of {{.baseBranchName}}). It will then hard-reset the current branch to its upstream branch. Do you want to continue?",
		MoveCommitsToNewBranchMenuPrompt:     "This will take all unpushed commits and move them to a new branch. This new branch can either be created from the main branch ({{.baseBranchName}}) or stacked on top of the current branch. Which of these would you like to do?",
		MoveCommitsToNewBranchFromBaseItem:   "New branch from base branch (%s)",
		MoveCommitsToNewBranchStackedItem:    "New branch stacked on current branch (%s)",
		CannotMoveCommitsFromDetachedHead:    "Cannot move commits from a detached head",
		CannotMoveCommitsNoUpstream:          "Cannot move commits from a branch that has no upstream branch",
		CannotMoveCommitsBehindUpstream:      "Cannot move commits from a branch that is behind its upstream branch",
		CannotMoveCommitsNoUnpushedCommits:   "There are no unpushed commits to move to a new branch",
		NoBranchesThisRepo:                   "No branches for this repo",
		CommitWithoutMessageErr:              "You cannot commit without a commit message",
		Close:                                "Close",
		CloseCancel:                          "Close/Cancel",
		Confirm:                              "Confirm",
		Quit:                                 "Quit",
		SquashTooltip:                        "Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it.",
		NoCommitsThisBranch:                  "No commits for this branch",
		UpdateRefHere:                        "Update branch '{{.ref}}' here",
		ExecCommandHere:                      "Execute the following command here:",
		CannotSquashOrFixupFirstCommit:       "There's no commit below to squash into",
		CannotSquashOrFixupMergeCommit:       "Cannot squash or fixup a merge commit",
		Fixup:                                "Fixup",
		FixupKeepMessage:                     "Fixup and use this commit's message",
		FixupKeepMessageTooltip:              "Meld the selected commit into the commit below, using this commit's message.",
		SetFixupMessage:                      "Set fixup message",
		SetFixupMessageTooltip:               "Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message.",
		FixupDiscardMessage:                  "Fixup and discard this commit's message",
		FixupDiscardMessageTooltip:           "Meld the selected commit into the commit below, discarding this commit's message.",
		SureSquashThisCommit:                 "Are you sure you want to squash the selected commit(s) into the commit below?",
		Squash:                               "Squash",
		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",
		Edit:                                 "Edit",
		Revert:                               "Revert",
		RevertCommitTooltip:                  "Create a revert commit for the selected commit, which applies the selected commit's changes in reverse.",
		Reword:                               "Reword",
		CommitRewordTooltip:                  "Reword the selected commit's message.",
		DropCommit:                           "Drop",
		DropCommitTooltip:                    "Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts.",
		MoveDownCommit:                       "Move commit down one",
		MoveUpCommit:                         "Move commit up one",
		CannotMoveAnyFurther:                 "Cannot move any further",
		CannotMoveMergeCommit:                "Cannot move a merge commit",
		EditCommit:                           "Edit (start interactive rebase)",
		EditCommitTooltip:                    "Edit the selected commit. Use this to start an interactive rebase from the selected commit. When already mid-rebase, this will mark the selected commit for editing, which means that upon continuing the rebase, the rebase will pause at the selected commit to allow you to make changes.",
		AmendCommitTooltip:                   "Amend commit with staged changes. If the selected commit is the HEAD commit, this will perform `git commit --amend`. Otherwise the commit will be amended via a rebase.",
		Amend:                                "Amend",
		ResetAuthor:                          "Reset author",
		ResetAuthorTooltip:                   "Reset the commit's author to the currently configured user. This will also renew the author timestamp",

Review comment (suggestion):
"Meld" reads really weird to me; the standard term for this is "squash". I realize we already use "Meld" on main in the `FixupTooltip` text, but there's a reason in that case, because that text also mentions the 'squash' command, so it uses another term to avoid confusion; we don't have this problem here, so I'd prefer to say "Squash" in this case.

Also, I wonder if we should be even more explicit and say "using this commit's message, discarding the message of the commit below." Maybe that's over the top, but the extra clarity could be helpful.

Code after:
		NewBranchFromStashTooltip:            "Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit.",
		MoveCommitsToNewBranch:               "Move commits to new branch",
		MoveCommitsToNewBranchTooltip:        "Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.\n\nNote that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which).",
		MoveCommitsToNewBranchFromMainPrompt: "This will take all unpushed commits and move them to a new branch (off of {{.baseBranchName}}). It will then hard-reset the current branch to its upstream branch. Do you want to continue?",
		MoveCommitsToNewBranchMenuPrompt:     "This will take all unpushed commits and move them to a new branch. This new branch can either be created from the main branch ({{.baseBranchName}}) or stacked on top of the current branch. Which of these would you like to do?",
		MoveCommitsToNewBranchFromBaseItem:   "New branch from base branch (%s)",
		MoveCommitsToNewBranchStackedItem:    "New branch stacked on current branch (%s)",
		CannotMoveCommitsFromDetachedHead:    "Cannot move commits from a detached head",
		CannotMoveCommitsNoUpstream:          "Cannot move commits from a branch that has no upstream branch",
		CannotMoveCommitsBehindUpstream:      "Cannot move commits from a branch that is behind its upstream branch",
		CannotMoveCommitsNoUnpushedCommits:   "There are no unpushed commits to move to a new branch",
		NoBranchesThisRepo:                   "No branches for this repo",
		CommitWithoutMessageErr:              "You cannot commit without a commit message",
		Close:                                "Close",
		CloseCancel:                          "Close/Cancel",
		Confirm:                              "Confirm",
		Quit:                                 "Quit",
		SquashTooltip:                        "Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it.",
		NoCommitsThisBranch:                  "No commits for this branch",
		UpdateRefHere:                        "Update branch '{{.ref}}' here",
		ExecCommandHere:                      "Execute the following command here:",
		CannotSquashOrFixupFirstCommit:       "There's no commit below to squash into",
		CannotSquashOrFixupMergeCommit:       "Cannot squash or fixup a merge commit",
		Fixup:                                "Fixup",
		FixupKeepMessage:                     "Fixup and use this commit's message",
		FixupKeepMessageTooltip:              "Squash the selected commit into the commit below, using this commit's message, discarding the message of the commit below.",
		SetFixupMessage:                      "Set fixup message",
		SetFixupMessageTooltip:               "Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message.",
		FixupDiscardMessage:                  "Fixup and discard this commit's message",
		FixupDiscardMessageTooltip:           "Squash the selected commit into the commit below, discarding this commit's message.",
		SureSquashThisCommit:                 "Are you sure you want to squash the selected commit(s) into the commit below?",
		Squash:                               "Squash",
		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",
		Edit:                                 "Edit",
		Revert:                               "Revert",
		RevertCommitTooltip:                  "Create a revert commit for the selected commit, which applies the selected commit's changes in reverse.",
		Reword:                               "Reword",
		CommitRewordTooltip:                  "Reword the selected commit's message.",
		DropCommit:                           "Drop",
		DropCommitTooltip:                    "Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts.",
		MoveDownCommit:                       "Move commit down one",
		MoveUpCommit:                         "Move commit up one",
		CannotMoveAnyFurther:                 "Cannot move any further",
		CannotMoveMergeCommit:                "Cannot move a merge commit",
		EditCommit:                           "Edit (start interactive rebase)",
		EditCommitTooltip:                    "Edit the selected commit. Use this to start an interactive rebase from the selected commit. When already mid-rebase, this will mark the selected commit for editing, which means that upon continuing the rebase, the rebase will pause at the selected commit to allow you to make changes.",
		AmendCommitTooltip:                   "Amend commit with staged changes. If the selected commit is the HEAD commit, this will perform `git commit --amend`. Otherwise the commit will be amended via a rebase.",
		Amend:                                "Amend",
		ResetAuthor:                          "Reset author",
		ResetAuthorTooltip:                   "Reset the commit's author to the currently configured user. This will also renew the author timestamp",