aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-13 21:13:22 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-13 21:13:22 +0100
commit9553b2239c7de8359489630943d8a4d0ab383478 (patch)
treee494c9f51925f5b805c2ba854660d3f48ea4eeea /phpBB/language
parent0a5d2a84d158e23b1d2e724d569c183bb049892e (diff)
parentedd5866a6ed4325a6d1df728842c310d7da407fd (diff)
downloadforums-9553b2239c7de8359489630943d8a4d0ab383478.tar
forums-9553b2239c7de8359489630943d8a4d0ab383478.tar.gz
forums-9553b2239c7de8359489630943d8a4d0ab383478.tar.bz2
forums-9553b2239c7de8359489630943d8a4d0ab383478.tar.xz
forums-9553b2239c7de8359489630943d8a4d0ab383478.zip
Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympus
* igorw/ticket/10087: [ticket/10087] Organize bans in acp_baninto optgroups
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/ban.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 099834d1e4..7b2ef59a7a 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -68,6 +68,9 @@ $lang = array_merge($lang, array(
'LENGTH_BAN_INVALID' => 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
+ 'OPTIONS_BANNED' => 'Banned',
+ 'OPTIONS_EXCLUDED' => 'Excluded',
+
'PERMANENT' => 'Permanent',
'UNTIL' => 'Until',