aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/mcp.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-04-24 19:16:46 +0200
committerNils Adermann <naderman@naderman.de>2013-04-24 19:16:46 +0200
commitb8c2bf6ce4be97c0ae100f746afe465a5765dae1 (patch)
tree25f6d482b43e4e99485057f0c1e43ef94f1ce175 /phpBB/language/en/mcp.php
parentb3497d955f328bb8ddd103d7162a8b2f6c0bc5fd (diff)
parent9f545a7f6ba7ddd54fae083563b5b582e05f5c1c (diff)
downloadforums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar
forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.gz
forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.bz2
forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.xz
forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.zip
Merge remote-tracking branch 'github-asperous/ticket/9975' into develop
* github-asperous/ticket/9975: [ticket/9975] Moved a few E_USER_ERROR errors to /language Conflicts: phpBB/includes/user.php
Diffstat (limited to 'phpBB/language/en/mcp.php')
-rw-r--r--phpBB/language/en/mcp.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index eaa2d7e3a5..29f418183f 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -250,6 +250,8 @@ $lang = array_merge($lang, array(
'ONLY_TOPIC' => 'Only topic ā€œ%sā€',
'OTHER_USERS' => 'Other users posting from this IP',
+ 'QUICKMOD_ACTION_NOT_ALLOWED' => "%s not allowed as quickmod",
+
'PM_REPORT_CLOSED_SUCCESS' => 'The selected PM report has been closed successfully.',
'PM_REPORT_DELETED_SUCCESS' => 'The selected PM report has been deleted successfully.',
'PM_REPORTED_SUCCESS' => 'This private message has been successfully reported.',