mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
This commit is contained in:
Andreas Fischer
2012-06-21 10:31:08 +02:00
parent ba21be88f5 80180a6a20
commit 85ea062a05
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,6 +404,7 @@ $lang = array_merge($lang, array(
'RULE_ADDED' => 'Rule successfully added.',
'RULE_ALREADY_DEFINED' => 'This rule was defined previously.',
'RULE_DELETED' => 'Rule successfully removed.',
'RULE_LIMIT_REACHED' => 'You cannot add more PM rules. You have reached the maximum number of rules.',
'RULE_NOT_DEFINED' => 'Rule not correctly specified.',
'RULE_REMOVED_MESSAGES' => array(
1 => '%d private message was removed due to private message filters.',