diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/email.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/viewforum.php | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index 14ee520b04..190fd7949e 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang)) // Email settings $lang = array_merge($lang, array( - 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group <strong>having the option to receive mass emails enabled</strong>. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed', + 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group <strong>having the option to receive mass emails enabled</strong>. To achive this an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an email, for more recipients more emails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.', 'ALL_USERS' => 'All users', 'COMPOSE' => 'Compose', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 31ded03e38..7880910d7e 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -110,7 +110,7 @@ $lang = array_merge($lang, array( 'DEFAULT' => 'Default', 'DELETE_ROLE' => 'Delete role', - 'DELETE_ROLE_CONFIRM' => 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loosing their permission settings.', + 'DELETE_ROLE_CONFIRM' => 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loose their permission settings.', 'DISPLAY_ROLE_ITEMS' => 'View items using this role', 'EDIT_PERMISSIONS' => 'Edit permissions', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 17f4ae3378..1bf7d27d25 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -560,7 +560,7 @@ $lang = array_merge($lang, array( 'TOTAL_LOGS' => '%d logs', 'TOTAL_NO_PM' => '0 private messages in total', 'TOTAL_PM' => '1 private messages in total', - 'TOTAL_PMS' => '$d private messages in total', + 'TOTAL_PMS' => '%d private messages in total', 'TOTAL_POSTS' => 'Total posts', 'TOTAL_POSTS_OTHER' => 'Total posts <strong>%d</strong>', 'TOTAL_POSTS_ZERO' => 'Total posts <strong>0</strong>', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 872c1a9d98..ca656b7a84 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -182,7 +182,7 @@ $lang = array_merge($lang, array( 'FIELD_INVALID_DATE' => 'The field “%s” has an invalid date.', 'FOE_MESSAGE' => 'Message from foe', - 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible and personal messages will not be permitted. Please note that you cannot ignore moderators or administrators.', + 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', 'FOES_UPDATED' => 'Your foes list has been updated successfully', 'FOLDER_ADDED' => 'Folder successfully added', 'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored', diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index 8a1802b414..00c54d7137 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -42,7 +42,6 @@ $lang = array_merge($lang, array( 'LOGIN_NOTIFY_FORUM' => 'You have been notified about this forum, please login to view it.', 'MARK_TOPICS_READ' => 'Mark topics read', - 'MOVED_TOPIC' => 'Moved topic', 'NEW_POSTS_HOT' => 'New posts [ Popular ]', 'NEW_POSTS_LOCKED' => 'New posts [ Locked ]', |