diff options
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -rw-r--r-- | options/locale/locale_en-US.ini | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 65ce6c6bc2..e0973fe874 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2280,6 +2280,7 @@ settings.event_wiki_desc = Wiki page created, renamed, edited or deleted. settings.event_release = Release settings.event_release_desc = Release published, updated or deleted in a repository. settings.event_push = Push +settings.event_force_push = Force Push settings.event_push_desc = Git push to a repository. settings.event_repository = Repository settings.event_repository_desc = Repository created or deleted. @@ -2373,19 +2374,28 @@ settings.protect_this_branch = Enable Branch Protection 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_disable_force_push = Disable Force Push +settings.protect_disable_force_push_desc = No force 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_enable_force_push_all = Enable Force Push +settings.protect_enable_force_push_all_desc = Anyone with push access will be allowed to force push to this branch. +settings.protect_enable_force_push_allowlist = Allowlist Restricted Force Push +settings.protect_enable_force_push_allowlist_desc = Only allowlisted users or teams with push access will be allowed to force push to this branch. settings.protect_enable_merge = Enable Merge settings.protect_enable_merge_desc = Anyone with write access will be allowed to merge the pull requests into this branch. -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_teams = Whitelisted teams for pushing: -settings.protect_merge_whitelist_committers = Enable Merge Whitelist -settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch. -settings.protect_merge_whitelist_users = Whitelisted users for merging: -settings.protect_merge_whitelist_teams = Whitelisted teams for merging: +settings.protect_whitelist_committers = Allowlist Restricted Push +settings.protect_whitelist_committers_desc = Only allowlisted users or teams will be allowed to push to this branch (but not force push). +settings.protect_whitelist_deploy_keys = Allowlist deploy keys with write access to push. +settings.protect_whitelist_users = Allowlisted users for pushing: +settings.protect_whitelist_teams = Allowlisted teams for pushing: +settings.protect_force_push_allowlist_users = Allowlisted users for force pushing: +settings.protect_force_push_allowlist_teams = Allowlisted teams for force pushing: +settings.protect_force_push_allowlist_deploy_keys = Allowlist deploy keys with push access to force push. +settings.protect_merge_whitelist_committers = Enable Merge Allowlist +settings.protect_merge_whitelist_committers_desc = Allow only allowlisted users or teams to merge pull requests into this branch. +settings.protect_merge_whitelist_users = Allowlisted users for merging: +settings.protect_merge_whitelist_teams = Allowlisted teams for merging: settings.protect_check_status_contexts = Enable Status Check settings.protect_status_check_patterns = Status check patterns: settings.protect_status_check_patterns_desc = Enter patterns to specify which status checks must pass before branches can be merged into a branch that matches this rule. Each line specifies a pattern. Patterns cannot be empty. @@ -2396,10 +2406,10 @@ settings.protect_invalid_status_check_pattern = Invalid status check pattern: "% settings.protect_no_valid_status_check_patterns = No valid status check patterns. settings.protect_required_approvals = Required approvals: 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.protect_approvals_whitelist_enabled = Restrict approvals to allowlisted users or teams +settings.protect_approvals_whitelist_enabled_desc = Only reviews from allowlisted users or teams will count to the required approvals. Without approval allowlist, reviews from anyone with write access count to the required approvals. +settings.protect_approvals_whitelist_users = Allowlisted reviewers: +settings.protect_approvals_whitelist_teams = Allowlisted teams for reviews: settings.dismiss_stale_approvals = Dismiss stale approvals settings.dismiss_stale_approvals_desc = When new commits that change the content of the pull request are pushed to the branch, old approvals will be dismissed. settings.ignore_stale_approvals = Ignore stale approvals |