diff options
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -rw-r--r-- | options/locale/locale_en-US.ini | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ae93026bdd..98133cdab3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1382,9 +1382,13 @@ settings.protected_branch_can_push_yes = You can push settings.protected_branch_can_push_no = You can not push settings.branch_protection = Branch Protection for Branch '<b>%s</b>' settings.protect_this_branch = Enable Branch Protection -settings.protect_this_branch_desc = Prevent deletion and disable any Git pushing to the branch. -settings.protect_whitelist_committers = Enable Push Whitelist -settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to push to this branch (but not force push). +settings.protect_this_branch_desc = Prevents deletion and restricts Git pushing and merging to the branch. +settings.protect_disable_push = Disable Push +settings.protect_disable_push_desc = No pushing will be allowed to this branch. +settings.protect_enable_push = Enable Push +settings.protect_enable_push_desc = Anyone with write access will be allowed to push to this branch (but not force push). +settings.protect_whitelist_committers = Whitelist Restricted Push +settings.protect_whitelist_committers_desc = Only whitelisted users or teams will be allowed to push to this branch (but not force push). settings.protect_whitelist_deploy_keys = Whitelist deploy keys with write access to push settings.protect_whitelist_users = Whitelisted users for pushing: settings.protect_whitelist_search_users = Search users… @@ -1398,7 +1402,9 @@ settings.protect_check_status_contexts = Enable Status Check settings.protect_check_status_contexts_desc = Require status checks to pass before merging Choose which status checks must pass before branches can be merged into a branch that matches this rule. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a branch that matches this rule after status checks have passed. If no contexts are selected, the last commit must be successful regardless of context. settings.protect_check_status_contexts_list = Status checks found in the last week for this repository settings.protect_required_approvals = Required approvals: -settings.protect_required_approvals_desc = Allow only to merge pull request with enough positive reviews of whitelisted users or teams. +settings.protect_required_approvals_desc = Allow only to merge pull request with enough positive reviews. +settings.protect_approvals_whitelist_enabled = Restrict approvals to whitelisted users or teams +settings.protect_approvals_whitelist_enabled_desc = Only reviews from whitelisted users or teams will count to the required approvals. Without approval whitelist, reviews from anyone with write access count to the required approvals. settings.protect_approvals_whitelist_users = Whitelisted reviewers: settings.protect_approvals_whitelist_teams = Whitelisted teams for reviews: settings.add_protected_branch = Enable protection |