diff options
| author | zeripath <art27@cantab.net> | 2020-10-24 04:34:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 23:34:21 -0400 |
| commit | 0800c7e91dfb7e4128da0fdbd5601db4e2c13a0c (patch) | |
| tree | cac617b2e2a220cf93677be2b63d523830b8f5fe /options | |
| parent | f40a2a4404e3eabf5e28ae43e1f395bb13176307 (diff) | |
| download | gitea-0800c7e91dfb7e4128da0fdbd5601db4e2c13a0c.tar.gz gitea-0800c7e91dfb7e4128da0fdbd5601db4e2c13a0c.zip | |
Rearrange the order of the merged by etc. in locale (#13284)
Fix #13260
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 18c621db67..cb4415afbb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1030,10 +1030,10 @@ issues.action_milestone_no_select = No milestone issues.action_assignee = Assignee issues.action_assignee_no_select = No assignee issues.opened_by = opened %[1]s by <a href="%[2]s">%[3]s</a> -pulls.merged_by = merged %[1]s by <a href="%[2]s">%[3]s</a> -pulls.merged_by_fake = merged %[1]s by %[2]s +pulls.merged_by = by <a href="%[2]s">%[3]s</a> merged %[1]s +pulls.merged_by_fake = by %[2]s merged %[1]s issues.closed_by = by <a href="%[2]s">%[3]s</a> closed %[1]s -issues.opened_by_fake = opened %[1]s by %[2]s +issues.opened_by_fake = by %[2]s opened %[1]s issues.closed_by_fake = by %[2]s closed %[1]s issues.previous = Previous issues.next = Next @@ -1268,7 +1268,7 @@ pulls.rebase_conflict_summary = Error Message ; </summary><code>%[2]s<br>%[3]s</code></details> 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.push_rejected = Merge Failed: The push was rejected. Review the githooks for this repository. +pulls.push_rejected = Merge Failed: The push was rejected. Review the githooks 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 githooks 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.` |