aboutsummaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorJannik Beyerstedt <code@jannikbeyerstedt.de>2019-05-11 09:42:19 +0200
committerLauris BH <lauris@nix.lv>2019-05-11 10:42:19 +0300
commitf378cb572a73aa826a18f40c28cfcd4cd1e661fc (patch)
treeec35d95af315d2f0809ccf6fadf15da522bb58e6 /options
parent1dc401635b8acb20f4222216ad0828ef39617989 (diff)
downloadgitea-f378cb572a73aa826a18f40c28cfcd4cd1e661fc.tar.gz
gitea-f378cb572a73aa826a18f40c28cfcd4cd1e661fc.zip
improve description of branch protection (fix #6886) (#6906)
The branch protection description text were not quite accurate.
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 570498958b..a85221ab74 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1269,9 +1269,9 @@ 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 Git force pushing to the branch.
+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 bypass push restrictions.
+settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to push to this branch (but not force push).
settings.protect_whitelist_users = Whitelisted users for pushing:
settings.protect_whitelist_search_users = Search users…
settings.protect_whitelist_teams = Whitelisted teams for pushing: