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 | |
| 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')
| -rw-r--r-- | phpBB/language/en/acp/ban.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 2dc0489030..68a68ebe54 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -73,10 +73,10 @@ $lang = array_merge($lang, array( 'PERMANENT' => 'Permanent', 'UNTIL' => 'Until', - 'USER_BAN' => 'Ban one or more usernames', + 'USER_BAN' => 'Ban one or more users by username', 'USER_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered users from all current bans.', 'USER_BAN_EXPLAIN' => 'You can ban multiple users in one go by entering each name on a new line. Use the <span style="text-decoration: underline;">Find a member</span> facility to look up and add one or more users automatically.', 'USER_NO_BANNED' => 'No banned usernames', - 'USER_UNBAN' => 'Un-ban or un-exclude usernames', + 'USER_UNBAN' => 'Un-ban or un-exclude users by username', '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.', )); 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', |