Skip to content

Commit 0800c7e

Browse files
authored
Rearrange the order of the merged by etc. in locale (#13284)
Fix #13260 Signed-off-by: Andrew Thornton <[email protected]>
1 parent f40a2a4 commit 0800c7e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

options/locale/locale_en-US.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,10 +1030,10 @@ issues.action_milestone_no_select = No milestone
10301030
issues.action_assignee = Assignee
10311031
issues.action_assignee_no_select = No assignee
10321032
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
10351035
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
10371037
issues.closed_by_fake = by %[2]s closed %[1]s
10381038
issues.previous = Previous
10391039
issues.next = Next
@@ -1268,7 +1268,7 @@ pulls.rebase_conflict_summary = Error Message
12681268
; </summary><code>%[2]s<br>%[3]s</code></details>
12691269
pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
12701270
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.
12721272
pulls.push_rejected_summary = Full Rejection Message
12731273
pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the githooks for this repository
12741274
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

Comments
 (0)