diff options
| author | James Lakin <jamesorlakin@users.noreply.github.com> | 2020-02-03 22:14:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 00:14:38 +0200 |
| commit | 3ff95cef606fad166527b092cb063081e3b3b84e (patch) | |
| tree | da17ccedb0810d163de22ad41999977800f46293 /options | |
| parent | 20c513be6e376231a33f01625f5ae747d2051241 (diff) | |
| download | gitea-3ff95cef606fad166527b092cb063081e3b3b84e.tar.gz gitea-3ff95cef606fad166527b092cb063081e3b3b84e.zip | |
Show if a PR has conflicting files on the PR lists (#10130)
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index cecf942a42..88fbce598f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1066,6 +1066,7 @@ pulls.blocked_by_rejection = "This Pull Request has changes requested by an offi pulls.can_auto_merge_desc = This pull request can be merged automatically. pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts. pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. +pulls.num_conflicting_files = "%d conflicting files" pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled. pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually. pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress. |