aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-07-07 13:33:53 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-07-07 13:33:53 +0000
commitfd667f9932f5420815396291c2b13238dc2944a1 (patch)
tree568139b80faaed993853913ed3e6b25c6e90ffef /phpBB/language
parenteb4eee77ac5b870966a00b4e23ff14f204e18c68 (diff)
downloadforums-fd667f9932f5420815396291c2b13238dc2944a1.tar
forums-fd667f9932f5420815396291c2b13238dc2944a1.tar.gz
forums-fd667f9932f5420815396291c2b13238dc2944a1.tar.bz2
forums-fd667f9932f5420815396291c2b13238dc2944a1.tar.xz
forums-fd667f9932f5420815396291c2b13238dc2944a1.zip
Fix bug #47815 - View end of ban in MCP and ACP when user is banned by duration - Patch by Pyramide
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9727 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/ban.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 5fcbb1fa69..099834d1e4 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -48,6 +48,8 @@ $lang = array_merge($lang, array(
'BAN_REASON' => 'Reason for ban',
'BAN_GIVE_REASON' => 'Reason shown to the banned',
'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully.',
+ 'BANNED_UNTIL_DATE' => 'until %s', // Example: "until Mon 13.Jul.2009, 14:44"
+ 'BANNED_UNTIL_DURATION' => '%1$s (until %2$s)', // Example: "7 days (until Tue 14.Jul.2009, 14:44)"
'EMAIL_BAN' => 'Ban one or more e-mail addresses',
'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered e-mail address from all current bans.',
@@ -67,7 +69,7 @@ $lang = array_merge($lang, array(
'LENGTH_BAN_INVALID' => 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
'PERMANENT' => 'Permanent',
-
+
'UNTIL' => 'Until',
'USER_BAN' => 'Ban one or more usernames',
'USER_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered users from all current bans.',
@@ -75,8 +77,6 @@ $lang = array_merge($lang, array(
'USER_NO_BANNED' => 'No banned usernames',
'USER_UNBAN' => 'Un-ban or un-exclude usernames',
'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
-
-
));
?> \ No newline at end of file