diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-10-30 16:12:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-10-30 16:12:22 +0100 |
| commit | 1dfb52b8052f984edd042410170a7066505e2997 (patch) | |
| tree | 73604cee76c7d5fedfa612b2f5a0e13337c5dc08 | |
| parent | 72a3bcd0484460d2aeb5610762e162ca30f24263 (diff) | |
| parent | a63490f7441398a9ec1617685e604535dd545069 (diff) | |
| download | forums-1dfb52b8052f984edd042410170a7066505e2997.tar forums-1dfb52b8052f984edd042410170a7066505e2997.tar.gz forums-1dfb52b8052f984edd042410170a7066505e2997.tar.bz2 forums-1dfb52b8052f984edd042410170a7066505e2997.tar.xz forums-1dfb52b8052f984edd042410170a7066505e2997.zip | |
Merge branch 'develop-olympus' into develop
| -rw-r--r-- | phpBB/adm/style/acp_users.html | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 87bd9ac882..a8794176a9 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -13,7 +13,7 @@ <fieldset> <legend>{L_SELECT_USER}</legend> <dl> - <dt><label for="username">{L_FIND_USERNAME}:</label></dt> + <dt><label for="username">{L_ENTER_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username" /></dd> <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index c79197d07a..44a63a6acb 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -165,6 +165,7 @@ $lang = array_merge($lang, array( 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', 'ENABLED' => 'Enabled', 'ENCLOSURE' => 'Enclosure', + 'ENTER_USERNAME' => 'Enter username', 'ERR_CHANGING_DIRECTORY' => 'Unable to change directory.', 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', |