'BUMP_INTERVAL' => 'Bump interval',- 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',+ 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic. Setting the value to 0 disables this feature.', 'CHAR_LIMIT' => 'Maximum characters per post/message', 'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.', 'DELETE_TIME' => 'Limit deleting time',@@ -246,32 +246,40 @@ $lang = array_merge($lang, array(

-Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured.+Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occured.

Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.phpindex 88b2cc2..93ea1be 100644--- a/phpBB/language/en/help_faq.php+++ b/phpBB/language/en/help_faq.php@@ -95,8 +95,8 @@ $help = array( 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).' ), array(- 0 => 'How do I show an image below my username?',- 1 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'+ 0 => 'How do I show an image along with my username?',+ 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.' ), array( 0 => 'What is my rank and how do I change it?',diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.phpindex ab03cdb..fc1b8c8 100644--- a/phpBB/language/en/mcp.php+++ b/phpBB/language/en/mcp.php@@ -253,6 +253,8 @@ $lang = array_merge($lang, array( 'PM_REPORT_DELETED_SUCCESS' => 'The selected PM report has been deleted successfully.', 'PM_REPORTED_SUCCESS' => 'This private message has been successfully reported.', 'PM_REPORT_TOTAL' => 'In total there is <strong>1</strong> PM report to review.',+ 'PM_REPORTS_CLOSED_SUCCESS' => 'The selected PM reports have been closed successfully.',+ 'PM_REPORTS_DELETED_SUCCESS'=> 'The selected PM reports have been deleted successfully.', 'PM_REPORTS_TOTAL' => 'In total there are <strong>%d</strong> PM reports to review.', 'PM_REPORTS_ZERO_TOTAL' => 'There are no PM reports to review.', 'PM_REPORT_DETAILS' => 'Private message report details',@@ -327,6 +329,7 @@ $lang = array_merge($lang, array( 'SPLIT_TOPIC_BEYOND_CONFIRM' => 'Are you sure you want to split this topic at the selected post?', 'SPLIT_TOPIC_EXPLAIN' => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.',