aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/common.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-07-14 20:35:53 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-07-14 20:35:53 +0000
commite3866c939d78b925844cd61d6ad567988f24e42d (patch)
tree5dc7ead67990b8770adac05a2d9464064e33e617 /phpBB/language/en/acp/common.php
parent0b2979c6bab97297f839937606635fd4cc6b1eae (diff)
downloadforums-e3866c939d78b925844cd61d6ad567988f24e42d.tar
forums-e3866c939d78b925844cd61d6ad567988f24e42d.tar.gz
forums-e3866c939d78b925844cd61d6ad567988f24e42d.tar.bz2
forums-e3866c939d78b925844cd61d6ad567988f24e42d.tar.xz
forums-e3866c939d78b925844cd61d6ad567988f24e42d.zip
Feature Bug #43375 - Ability to delete warnings and keep warnings permanently
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9758 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r--phpBB/language/en/acp/common.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 720aba6002..9f69fe3790 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -186,6 +186,7 @@ $lang = array_merge($lang, array(
'ACP_USER_ROLES' => 'User roles',
'ACP_USER_SECURITY' => 'User security',
'ACP_USER_SIG' => 'Signature',
+ 'ACP_USER_WARNINGS' => 'Warnings',
'ACP_VC_SETTINGS' => 'Visual confirmation settings',
'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview',
@@ -697,6 +698,7 @@ $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',