diff options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/email/admin_welcome_activated.txt | 4 | ||||
| -rw-r--r-- | phpBB/language/en/email/admin_welcome_inactive.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/help_faq.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/search_synonyms.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
6 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt index c16a403f00..2397868323 100644 --- a/phpBB/language/en/email/admin_welcome_activated.txt +++ b/phpBB/language/en/email/admin_welcome_activated.txt @@ -2,6 +2,8 @@ Subject: Account activated Hello {USERNAME}, -Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail. +Your account on "{SITENAME}" has now been activated, you may login using the username you received in a previous e-mail. + +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. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index af3ac9ca87..e0970d3ff3 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -10,7 +10,7 @@ Username: {USERNAME} Board URL: {U_BOARD} ---------------------------- -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.php index 88b2cc273d..596e0531df 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -96,7 +96,7 @@ $help = array( ), 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.' + 1 => 'There are two images which may appear below 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 administrators 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 administrators 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.php index ab03cdb0be..2e988e2d42 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', diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php index b85c39e5d5..1618c292d3 100644 --- a/phpBB/language/en/search_synonyms.php +++ b/phpBB/language/en/search_synonyms.php @@ -26,7 +26,7 @@ $synonyms = array( 'anemia' => 'anaemia', 'anemic' => 'anaemic', 'anesthesia' => 'anaesthesia', - 'appologize' => 'appologise', + 'apologize' => 'apologise', 'archean' => 'archaean', 'archeology' => 'archaeology', 'archeozoic' => 'archaeozoic', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 4b79a4b6ca..02b8a282d9 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -460,6 +460,7 @@ $lang = array_merge($lang, array( 'UCP_ZEBRA' => 'Friends & Foes', 'UCP_ZEBRA_FOES' => 'Manage foes', 'UCP_ZEBRA_FRIENDS' => 'Manage friends', + 'UNDISCLOSED_RECIPIENT' => 'Undisclosed Recipient', 'UNKNOWN_FOLDER' => 'Unknown folder', 'UNWATCH_MARKED' => 'Unwatch marked', 'UPLOAD_AVATAR_FILE' => 'Upload from your machine', |