diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-06-21 10:30:56 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-06-21 10:30:56 +0200 |
| commit | 80180a6a20077aff293b3d3dd0ce8b0065c33f3b (patch) | |
| tree | dfce0506a9d1d88bd894112532e9c448eaac0d44 /phpBB/language | |
| parent | 3e80268249983bef7455da89099bf4c1f7205008 (diff) | |
| parent | f1414386d7c22b7f3a9a978e902e67526bea029e (diff) | |
| download | forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar.gz forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar.bz2 forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar.xz forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.zip | |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[ticket/10935] Limit number of PM rules per user to 5000
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 7df26e040f..94d9a5171e 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -388,6 +388,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_MESSAGE' => 'One private message had been removed due to private message filters.', 'RULE_REMOVED_MESSAGES' => '%d private messages were removed due to private message filters.', |