aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/language/en/ucp.php1
-rw-r--r--phpBB/styles/prosilver/template/ucp_groups_manage.html2
-rw-r--r--phpBB/styles/subsilver2/template/ucp_groups_manage.html2
4 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 8a7114d1a7..d5930bfd58 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -117,6 +117,7 @@
<li>[Fix] Fix function to recalculate Nested Sets (Bug #41555 - Patch by EXreaction)</li>
<li>[Fix] Display and highlight already used rank images while assigning new rank (Bug #22665 - Patch by nickvergessen)</li>
<li>[Fix] Empty error message in UCP folder management when creating folder without name (Bug #39875 - Patch by nickvergessen)</li>
+ <li>[Fix] Wrong description in UCP group managment implicates missing feature (Bug #19945 - Patch by nickvergessen)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 282accdd03..d6148a737b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -79,6 +79,7 @@ $lang = array_merge($lang, array(
'ADD_NEW_RULE' => 'Add new rule',
'ADD_RULE' => 'Add rule',
'ADD_TO' => 'Add [To]',
+ 'ADD_USERS_UCP_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Please enter each username on a separate line.',
'ADMIN_EMAIL' => 'Administrators can e-mail me information',
'AGREE' => 'I agree to these terms',
'ALLOW_PM' => 'Allow users to send you private messages',
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 47a8acb13a..2171250621 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -170,7 +170,7 @@
<h3>{L_ADD_USERS}</h3>
- <p>{L_ADD_USERS_EXPLAIN}</p>
+ <p>{L_ADD_USERS_UCP_EXPLAIN}</p>
<fieldset>
<dl>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 6ae9816ca8..4aa2748f71 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -193,7 +193,7 @@
<h1>{L_ADD_USERS}</h1>
- <p>{L_ADD_USERS_EXPLAIN}</p>
+ <p>{L_ADD_USERS_UCP_EXPLAIN}</p>
<table class="tablebg" width="100%" cellspacing="1">
<tr>