diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-24 20:58:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-24 20:58:43 +0100 |
| commit | 800c779403f8f6e2cba887bdd3e9220a5d5ea922 (patch) | |
| tree | b3ba153340970ee3ae63d39cebffc2a454927a48 /phpBB/language/en/acp/common.php | |
| parent | ce76a028c8a0b577432584227518119970168420 (diff) | |
| parent | 574a9f4f2aa8f11c2ad27778c8f874d4fb896e9f (diff) | |
| download | forums-800c779403f8f6e2cba887bdd3e9220a5d5ea922.tar forums-800c779403f8f6e2cba887bdd3e9220a5d5ea922.tar.gz forums-800c779403f8f6e2cba887bdd3e9220a5d5ea922.tar.bz2 forums-800c779403f8f6e2cba887bdd3e9220a5d5ea922.tar.xz forums-800c779403f8f6e2cba887bdd3e9220a5d5ea922.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
Diffstat (limited to 'phpBB/language/en/acp/common.php')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 428b9ffd3b..6b48568bba 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -49,7 +49,7 @@ $lang = array_merge($lang, array( 'ACP_BAN' => 'Banning', 'ACP_BAN_EMAILS' => 'Ban emails', 'ACP_BAN_IPS' => 'Ban IPs', - 'ACP_BAN_USERNAMES' => 'Ban usernames', + 'ACP_BAN_USERNAMES' => 'Ban users', 'ACP_BBCODES' => 'BBCodes', 'ACP_BOARD_CONFIGURATION' => 'Board configuration', 'ACP_BOARD_FEATURES' => 'Board features', |