diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-09-06 10:13:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 22:13:08 -0400 |
| commit | 31c92d9695a43ff77a3eef2e8383343ef60f8ae7 (patch) | |
| tree | dbb8207a0fe13616859b506c753b5dc007bc4924 /options | |
| parent | 97aa749578a05b207d54dbbcd8580201b5eba359 (diff) | |
| download | gitea-31c92d9695a43ff77a3eef2e8383343ef60f8ae7.tar.gz gitea-31c92d9695a43ff77a3eef2e8383343ef60f8ae7.zip | |
Add missing translation (#26926)
Fix #26923
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 08aa320cc2..bdb9b0c9dd 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1764,6 +1764,7 @@ pulls.rebase_conflict_summary = Error Message pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy 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_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 |