mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-10-17 12:02:14 +02:00
parent 2974353101 6fba5613f8
commit 3f4abbd5ce
3 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/ucp.php
View File

@@ -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',