diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-05-12 12:32:28 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-05-12 12:32:28 +0000 |
| commit | 841f5d82f6a33c390ad02c543e7231361dd5e396 (patch) | |
| tree | 37ea675726e27cc1ee07251402a42f5a51fa5cd8 | |
| parent | efb25cc9f19e45edc3781892bca8f8ff933c2fbf (diff) | |
| download | forums-841f5d82f6a33c390ad02c543e7231361dd5e396.tar forums-841f5d82f6a33c390ad02c543e7231361dd5e396.tar.gz forums-841f5d82f6a33c390ad02c543e7231361dd5e396.tar.bz2 forums-841f5d82f6a33c390ad02c543e7231361dd5e396.tar.xz forums-841f5d82f6a33c390ad02c543e7231361dd5e396.zip | |
#10799
git-svn-id: file:///svn/phpbb/trunk@7546 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/email.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index ac08285040..6582131a50 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -34,7 +34,7 @@ $lang = array_merge($lang, array( 'ACP_ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the main settings for attachments and the associated special categories.', 'ACP_EXTENSION_GROUPS_EXPLAIN' => 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.', 'ACP_MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as <code>php</code>, <code>php3</code>, <code>php4</code>, <code>phtml</code>, <code>pl</code>, <code>cgi</code>, <code>py</code>, <code>rb</code>, <code>asp</code>, <code>aspx</code>, and so forth…).', - 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see files within the attachments upload directory but not assigned to posts. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this id by yourself, this feature is mainly for those people wanting to upload files with another program and assigning those (mostly large) files to an existing post.', + 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see files within the attachments upload directory but not assigned to posts. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself, this feature is mainly for those people wanting to upload files with another program and assigning those (mostly large) files to an existing post.', 'ADD_EXTENSION' => 'Add extension', 'ADD_EXTENSION_GROUP' => 'Add extension group', 'ADMIN_UPLOAD_ERROR' => 'Errors while trying to attach file: “%s”.', diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index 3c6d6bbe21..84b2b3db31 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 e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achive this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails 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.', + 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails 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', |