diff options
| author | zeripath <art27@cantab.net> | 2020-03-06 03:44:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 03:44:06 +0000 |
| commit | 80db44267ccb688c596e8375523af5cd92864d87 (patch) | |
| tree | b10136ec813c23e18ab30085a0b6f0e014550702 /options | |
| parent | f422a115f461472db6892da9142e930c67e63128 (diff) | |
| download | gitea-80db44267ccb688c596e8375523af5cd92864d87.tar.gz gitea-80db44267ccb688c596e8375523af5cd92864d87.zip | |
Add Approval Counts to pulls list (#10238)
* Add Approval Counts to pulls list
Add simple approvals counts to pulls lists
* Remove non-official counts
* Add PR features to milestone_issues.tmpl
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 375a2ec88d..ea4eccac8d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1082,6 +1082,11 @@ pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. pulls.num_conflicting_files_1 = "%d conflicting file" pulls.num_conflicting_files_n = "%d conflicting files" +pulls.approve_count_1 = "%d approval" +pulls.approve_count_n = "%d approvals" +pulls.reject_count_1 = "%d change request" +pulls.reject_count_n = "%d change requests" + 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. |