aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-11 20:44:57 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-11 20:44:57 +0200
commit54fff02f95e68f368e09ba8783ba83be2f8fcf76 (patch)
tree2215c1d58c83470b33a90d6872ada1efd18f4e33 /phpBB/language/en/acp
parent784938e68bbf8188165fabb82ae6670d78686a4f (diff)
parent0a5d167441004c4ed56b6b7cf32fd0c0eb5ae443 (diff)
downloadforums-54fff02f95e68f368e09ba8783ba83be2f8fcf76.tar
forums-54fff02f95e68f368e09ba8783ba83be2f8fcf76.tar.gz
forums-54fff02f95e68f368e09ba8783ba83be2f8fcf76.tar.bz2
forums-54fff02f95e68f368e09ba8783ba83be2f8fcf76.tar.xz
forums-54fff02f95e68f368e09ba8783ba83be2f8fcf76.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/profile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 41cbd9cb93..87c950581e 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -111,7 +111,7 @@ $lang = array_merge($lang, array(
'FIRST_OPTION' => 'First option',
'HIDE_PROFILE_FIELD' => 'Hide profile field',
- 'HIDE_PROFILE_FIELD_EXPLAIN' => 'Hide the profile field from all other users except the user, administrators and moderators who are still able to see this field. If the Display in user control panel option is disabled, the user will not be able to see or change this field and the field can only be changed by administrators.',
+ 'HIDE_PROFILE_FIELD_EXPLAIN' => 'Hide the profile field from all users except administrators and moderators, who are still able to see this field. If the Display in user control panel option is disabled, the user will not be able to see or change this field and the field can only be changed by administrators.',
'INVALID_CHARS_FIELD_IDENT' => 'Field identification can only contain lowercase a-z and _',
'INVALID_FIELD_IDENT_LEN' => 'Field identification can only be 17 characters long',