@@ -1030,10 +1030,10 @@ issues.action_milestone_no_select = No milestone
1030
1030
issues.action_assignee = Assignee
1031
1031
issues.action_assignee_no_select = No assignee
1032
1032
issues.opened_by = opened %[1]s by <a href="%[2]s">%[3]s</a>
1033
- pulls.merged_by = merged %[1]s by <a href="%[2]s">%[3]s</a>
1034
- pulls.merged_by_fake = merged %[1 ]s by %[2 ]s
1033
+ pulls.merged_by = by <a href="%[2]s">%[3]s</a> merged %[1]s
1034
+ pulls.merged_by_fake = by %[2 ]s merged %[1 ]s
1035
1035
issues.closed_by = by <a href="%[2]s">%[3]s</a> closed %[1]s
1036
- issues.opened_by_fake = opened %[1 ]s by %[2 ]s
1036
+ issues.opened_by_fake = by %[2 ]s opened %[1 ]s
1037
1037
issues.closed_by_fake = by %[2]s closed %[1]s
1038
1038
issues.previous = Previous
1039
1039
issues.next = Next
@@ -1268,7 +1268,7 @@ pulls.rebase_conflict_summary = Error Message
1268
1268
; </summary><code>%[2]s<br>%[3]s</code></details>
1269
1269
pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
1270
1270
pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
1271
- pulls.push_rejected = Merge Failed: The push was rejected. Review the githooks for this repository.
1271
+ pulls.push_rejected = Merge Failed: The push was rejected. Review the githooks for this repository.
1272
1272
pulls.push_rejected_summary = Full Rejection Message
1273
1273
pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the githooks for this repository
1274
1274
pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
0 commit comments