diff options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/mcp.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index ad14572737..1b6a496a7e 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -93,8 +93,6 @@ $lang = array_merge($lang, array( 'IP_INFO' => 'IP Information', - 'JUMP_TO' => 'Moderate forum', // Overwriting the jump to language variable for the mcp jumpbox - 'LATEST_LOGS' => 'Latest 5 logged actions', 'LATEST_REPORTED' => 'Latest 5 reports', 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting for approval', @@ -188,6 +186,7 @@ $lang = array_merge($lang, array( 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one', 'MERGE_TOPIC_ID' => 'Destination topic id', + 'MODERATE_FORUM' => 'Moderate forum', 'MOD_OPTIONS' => 'Moderator options', 'MORE_INFO' => 'Further information', 'MOST_WARNINGS' => 'Users with most warnings', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index aa9cc1c6cc..6899ca180e 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -157,6 +157,7 @@ $lang = array_merge($lang, array( 'DRAFT_UPDATED' => 'Draft successfully updated.', 'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll informations.', + 'EMAIL_BANNED_EMAIL' => 'The email address you entered is not allowed to be used.', 'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.', 'EMAIL_REMIND' => 'This must be the email address you supplied when registering.', 'EMAIL_TAKEN_EMAIL' => 'The entered email address is already in use', @@ -414,7 +415,7 @@ $lang = array_merge($lang, array( 'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.', 'USERNAME_CHARS_ANY_EXPLAIN' => 'Length must be between %1$d and %2$d characters.', 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.', - 'USERNAME_USERNAME_DISALLOWED' => 'The username you entered has been banned.', + 'USERNAME_DISALLOWED_USERNAME' => 'The username you entered has been banned.', 'USER_NOT_FOUND_OR_INACTIVE' => 'The usernames you specified could either not be found or are not activated users.', 'VIEW_AVATARS' => 'Display avatars', |