diff options
author | Marc Alexander <admin@m-a-styles.de> | 2015-10-17 12:02:14 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-17 12:02:14 +0200 |
commit | 3f4abbd5cee8a23ce0ba79981dc6c191f5467d11 (patch) | |
tree | 2831922f44ad245aeb85b47c96222e5db1661b32 /phpBB/language/en/ucp.php | |
parent | 2974353101ae60dc13f0de938920765d7a78dc95 (diff) | |
parent | 6fba5613f8ab2a973d1a71c25a7b5907b7de0c9d (diff) | |
download | forums-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/ucp.php')
-rw-r--r-- | phpBB/language/en/ucp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index b346051108..6063f71d98 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -340,7 +340,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', 'NOTIFICATION_TYPE_REPORT' => 'Someone reports a post', 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum to which you are subscribed', - 'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER' => 'Newly registered user requiring activation', + 'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER' => 'User requiring activation', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', |