diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-06-21 10:31:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-06-21 10:31:08 +0200 |
| commit | 85ea062a0536edc46ea1a8893201777f8137e41e (patch) | |
| tree | 8bde66da56f4a53396fb864ae71044b5347ffad8 /phpBB/language | |
| parent | ba21be88f54599ceb7e49317aa4eb553e59dd3b9 (diff) | |
| parent | 80180a6a20077aff293b3d3dd0ce8b0065c33f3b (diff) | |
| download | forums-85ea062a0536edc46ea1a8893201777f8137e41e.tar forums-85ea062a0536edc46ea1a8893201777f8137e41e.tar.gz forums-85ea062a0536edc46ea1a8893201777f8137e41e.tar.bz2 forums-85ea062a0536edc46ea1a8893201777f8137e41e.tar.xz forums-85ea062a0536edc46ea1a8893201777f8137e41e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 2d9cf46213..e3971c75e2 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -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.', |