troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 21:03:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rearrange the order of the merged by etc. in locale (#13284)

Browse source 
Fix #13260

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2020-10-24 04:34:21 +01:00 committed by GitHub
parent f40a2a4404
commit 0800c7e91d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
options/locale/locale_en-US.ini
View file

@ -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.`