diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-03-02 20:45:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 12:45:14 +0000 |
| commit | e650f64d812f5ebeb4a11d2ec20f2376c6d963bc (patch) | |
| tree | ed16e2e8a68b50ef03e6e1c6e8d17a64861c8dc8 /options | |
| parent | c0c2cb933bc59c5c9b2558c9bf53b495504f35f3 (diff) | |
| download | gitea-e650f64d812f5ebeb4a11d2ec20f2376c6d963bc.tar.gz gitea-e650f64d812f5ebeb4a11d2ec20f2376c6d963bc.zip | |
Fix incorrect redirection when creating a PR fails (#29537)
This is only a quick fix to make it easier to backport.
After this PR gets merged, I will propose a new PR to fix the FIXME.
<details>
</details>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6d4e109e1d..beda02603e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1792,9 +1792,9 @@ pulls.unrelated_histories = Merge Failed: The merge head and base do not share a pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again. pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again. pulls.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch. -pulls.push_rejected = Merge Failed: The push was rejected. Review the Git Hooks for this repository. +pulls.push_rejected = Push Failed: The push was rejected. Review the Git Hooks for this repository. pulls.push_rejected_summary = Full Rejection Message -pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the Git Hooks for this repository +pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git Hooks for this repository pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` pulls.status_checking = Some checks are pending pulls.status_checks_success = All checks were successful |