aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-13 21:14:21 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-13 21:14:21 +0100
commit3dfb11694247dc065529b193f51b9074ebda6784 (patch)
tree7c5298cf63e350596b6e4bf8398de648b41ab64e /phpBB/language
parent1b003fd244a9377731f118b62850861210d0a9b0 (diff)
parent9553b2239c7de8359489630943d8a4d0ab383478 (diff)
downloadforums-3dfb11694247dc065529b193f51b9074ebda6784.tar
forums-3dfb11694247dc065529b193f51b9074ebda6784.tar.gz
forums-3dfb11694247dc065529b193f51b9074ebda6784.tar.bz2
forums-3dfb11694247dc065529b193f51b9074ebda6784.tar.xz
forums-3dfb11694247dc065529b193f51b9074ebda6784.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [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 137224ba4f..c763ae6dbd 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',