diff options
| author | Iwasa Kazmi <kzmizzz@gmail.com> | 2019-11-19 16:35:37 +0900 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-11-19 07:35:37 +0000 |
| commit | 5a3af7992cefe2bc17fff61de059a2e8b62f2065 (patch) | |
| tree | 05934206867ef842ca97c0062a97720c8fda5f08 /options | |
| parent | 9ccb50f162bf58faeb5099755b6fdf21d807bdd4 (diff) | |
| download | gitea-5a3af7992cefe2bc17fff61de059a2e8b62f2065.tar.gz gitea-5a3af7992cefe2bc17fff61de059a2e8b62f2065.zip | |
fix placeholders in the error message (#9060)
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4d22aa2fd9..4b3edc9057 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1045,7 +1045,7 @@ pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff) pulls.squash_merge_pull_request = Squash and Merge pulls.invalid_merge_option = You cannot use this merge option for this pull request. pulls.merge_conflict = Merge Failed: There was a conflict whilst merging: %[1]s<br>%[2]s<br>Hint: Try a different strategy -pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %s[1]<br>%[1]s<br>%[2]s<br>Hint:Try a different strategy +pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s<br>%[2]s<br>%[3]s<br>Hint:Try a different strategy 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.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` |