aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-10-17 12:02:14 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-10-17 12:02:14 +0200
commit3f4abbd5cee8a23ce0ba79981dc6c191f5467d11 (patch)
tree2831922f44ad245aeb85b47c96222e5db1661b32 /phpBB/language/en/common.php
parent2974353101ae60dc13f0de938920765d7a78dc95 (diff)
parent6fba5613f8ab2a973d1a71c25a7b5907b7de0c9d (diff)
downloadforums-3f4abbd5cee8a23ce0ba79981dc6c191f5467d11.tar
forums-3f4abbd5cee8a23ce0ba79981dc6c191f5467d11.tar.gz
forums-3f4abbd5cee8a23ce0ba79981dc6c191f5467d11.tar.bz2
forums-3f4abbd5cee8a23ce0ba79981dc6c191f5467d11.tar.xz
forums-3f4abbd5cee8a23ce0ba79981dc6c191f5467d11.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/language/en/common.php')
-rw-r--r--phpBB/language/en/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a0dda19df9..20458dd3c1 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -472,7 +472,7 @@ $lang = array_merge($lang, array(
'NOTIFICATION_TOPIC_DISAPPROVED' => '<strong>Topic disapproved</strong>:',
'NOTIFICATION_TOPIC_IN_QUEUE' => '<strong>Topic approval</strong> request by %1$s:',
'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.',
- 'NOTIFICATION_ADMIN_ACTIVATE_USER' => '<strong>Activation required</strong> for newly registered user: ā€œ%1$sā€',
+ 'NOTIFICATION_ADMIN_ACTIVATE_USER' => '<strong>Activation required</strong> for deactivated or newly registered user: ā€œ%1$sā€',
// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
'NOTIFICATION_MANY_OTHERS' => 'others',
'NOTIFICATION_X_OTHERS' => array(