Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-12 21:10:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-12 21:10:45 +0300
commitbf1990164b801489b4475504701eefb66146e724 (patch)
treeb21f9118116f413cdbde621048bd9b93c1388424 /app/assets/javascripts/admin
parentdc250651ab26bf7bce9205d5fa4a45dd58e2df81 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
-rw-r--r--app/assets/javascripts/admin/users/components/actions/ban.vue7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/admin/users/components/actions/ban.vue b/app/assets/javascripts/admin/users/components/actions/ban.vue
index 4e9cefbfdd7..e5ab0f9123f 100644
--- a/app/assets/javascripts/admin/users/components/actions/ban.vue
+++ b/app/assets/javascripts/admin/users/components/actions/ban.vue
@@ -6,10 +6,11 @@ import { I18N_USER_ACTIONS } from '../../constants';
// TODO: To be replaced with <template> content in https://gitlab.com/gitlab-org/gitlab/-/issues/320922
const messageHtml = `
- <p>${s__('AdminUsers|When banned, users:')}</p>
+ <p>${s__('AdminUsers|When banned:')}</p>
<ul>
- <li>${s__("AdminUsers|Can't log in.")}</li>
- <li>${s__("AdminUsers|Can't access Git repositories.")}</li>
+ <li>${s__("AdminUsers|The user can't log in.")}</li>
+ <li>${s__("AdminUsers|The user can't access git repositories.")}</li>
+ <li>${s__('AdminUsers|Issues authored by this user are hidden from other users.')}</li>
</ul>
<p>${s__('AdminUsers|You can unban their account in the future. Their data remains intact.')}</p>
<p>${sprintf(