]> source.dussan.org Git - gitea.git/commitdiff
improve description of branch protection (fix #6886) (#6906)
authorJannik Beyerstedt <code@jannikbeyerstedt.de>
Sat, 11 May 2019 07:42:19 +0000 (09:42 +0200)
committerLauris BH <lauris@nix.lv>
Sat, 11 May 2019 07:42:19 +0000 (10:42 +0300)
The branch protection description text were not quite accurate.

options/locale/locale_en-US.ini

index 570498958b316416172d238806993bfdf1005d53..a85221ab74b96aaf137379d1bb925100ce6e9a61 100644 (file)
@@ -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: