aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/common.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-07-22 11:47:37 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-07-22 11:47:37 +0000
commit818b252f208b92157b56b101aac555eb1efb8cee (patch)
treed5757e59dc52e0635e9bf47aa9817b9b242fb5c8 /phpBB/language/en/acp/common.php
parent2dfd327828a5f6387ea051aa9e588f39249ed059 (diff)
downloadforums-818b252f208b92157b56b101aac555eb1efb8cee.tar
forums-818b252f208b92157b56b101aac555eb1efb8cee.tar.gz
forums-818b252f208b92157b56b101aac555eb1efb8cee.tar.bz2
forums-818b252f208b92157b56b101aac555eb1efb8cee.tar.xz
forums-818b252f208b92157b56b101aac555eb1efb8cee.zip
fix r9758
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9828 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r--phpBB/language/en/acp/common.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index ac8a14a21c..85380b2fd2 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -707,7 +707,6 @@ $lang = array_merge($lang, array(
'LOG_USER_REACTIVATE_USER' => '<strong>Forced user account reactivation</strong>',
'LOG_USER_UNLOCK' => '<strong>User unlocked own topic</strong><br />» %s',
'LOG_USER_WARNING' => '<strong>Added user warning</strong><br />» %s',
- 'LOG_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s',
'LOG_USER_WARNING_BODY' => '<strong>The following warning was issued to this user</strong><br />» %s',
'LOG_USER_GROUP_CHANGE' => '<strong>User changed default group</strong><br />» %s',
@@ -716,6 +715,10 @@ $lang = array_merge($lang, array(
'LOG_USER_GROUP_JOIN_PENDING' => '<strong>User joined group and needs to be approved</strong><br />» %s',
'LOG_USER_GROUP_RESIGN' => '<strong>User resigned membership from group</strong><br />» %s',
+ 'LOG_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s',
+ 'LOG_WARNINGS_DELETED' => '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+ 'LOG_WARNINGS_DELETED_ALL' => '<strong>Deleted all user warnings</strong><br />» %s',
+
'LOG_WORD_ADD' => '<strong>Added word censor</strong><br />» %s',
'LOG_WORD_DELETE' => '<strong>Deleted word censor</strong><br />» %s',
'LOG_WORD_EDIT' => '<strong>Edited word censor</strong><br />» %s',