fix typo and sentences

thanks @guillep2k

Co-Authored-By: guillep2k <[email protected]>

options/locale/locale_en-US.ini

@@ -1101,7 +1101,7 @@ pulls.required_status_check_failed = Some required checks were not successful.
 pulls.required_status_check_administrator = As an administrator, you may still merge this pull request.
 pulls.blocked_by_approvals = "This Pull Request doesn't have enough approvals yet. %d of %d approvals granted."
 pulls.blocked_by_rejection = "This Pull Request has changes requested by an official reviewer."
-pulls.blocked_by_outdated_branch = "This Pull Request is blocked by an outdated head branch."
+pulls.blocked_by_outdated_branch = "This Pull Request is blocked because it's outdated."
 pulls.can_auto_merge_desc = This pull request can be merged automatically.
 pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts.
 pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts.
@@ -1526,7 +1526,7 @@ settings.protected_branch_deletion = Disable Branch Protection
 settings.protected_branch_deletion_desc = Disabling branch protection allows users with write permission to push to the branch. Continue?
 settings.block_rejected_reviews = Block merge on rejected reviews
 settings.block_rejected_reviews_desc = Merging will not be possible when changes are requested by official reviewers, even if there are enough approvals.
-settings.block_outdated_branch = Block merge if branch is outdated
+settings.block_outdated_branch = Block merge if pull request is outdated
 settings.block_outdated_branch_desc = Merging will not be possible when head branch is behind base branch.
 settings.default_branch_desc = Select a default repository branch for pull requests and code commits:
 settings.choose_branch = Choose a branch…

services/pull/merge.go

@@ -587,7 +587,7 @@ func CheckPRReadyToMerge(pr *models.PullRequest) (err error) {
 
  if pr.ProtectedBranch.MergeBlockedByOutdatedBranch(pr) {
  return models.ErrNotAllowedToMerge{
- Reason: fmt.Sprintf("Head branch %d behind base branch", pr.CommitsBehind),
+ Reason: "The head branch is behind the base branch",
  }
  }