diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-11 18:13:52 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-11 18:13:52 +0000 |
| commit | 01b41453812dc7b990f03b81f85dcfb9a18076fd (patch) | |
| tree | d12e93524fa7625d1220088d34a5a957cd618624 /phpBB/language | |
| parent | ce3b07eee7dbefc68dcd8eab3ab667e6532c8561 (diff) | |
| download | forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar.gz forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar.bz2 forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar.xz forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.zip | |
- fixed a few bugs
- added user_add() function
- check posted images ([img]) for same domain/scipt and php files
- auth_api.html updated to the coding guidelines look&feel
- introduced ability to force non page-updates (cron is using it)
- correctly resend coppa email
git-svn-id: file:///svn/phpbb/trunk@6048 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/coppa_resend_inactive.txt | 43 | ||||
| -rw-r--r-- | phpBB/language/en/email/coppa_welcome_inactive.txt | 9 |
4 files changed, 47 insertions, 11 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index a615ba839d..ab9e6e524d 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -107,8 +107,8 @@ $lang = array_merge($lang, array( 'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content', 'NO_PARENT' => 'No Parent', 'NO_PERMISSIONS' => 'Do not copy permissions', - 'NO_PERMISSION_FORUM_ADD' => 'You do not have the neccessary permissions to delete forums', - 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the neccessary permissions to add forums', + 'NO_PERMISSION_FORUM_ADD' => 'You do not have the neccessary permissions to add forums', + 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the neccessary permissions to delete forums', 'PARENT_NOT_EXIST' => 'Parent does not exist', 'PRUNE_ANNOUNCEMENTS' => 'Prune Announcements', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 798199bdbd..1cd00cd530 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -132,7 +132,9 @@ $lang = array_merge($lang, array( 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', 'ENABLED' => 'Enabled', 'ENCLOSURE' => 'Enclosure', + 'ERR_CHANGING_DIRECTORY' => 'Unable to change directory', 'ERR_CONNECTING_SERVER' => 'Error connecting to the server', + 'ERR_UNABLE_TO_LOGIN' => 'Error on login. Supplied username or password wrong.', 'EXTENSION' => 'Extension', 'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed', diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt new file mode 100644 index 0000000000..d65367e31b --- /dev/null +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -0,0 +1,43 @@ +Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 + +{WELCOME_MSG} + +In compliance with the COPPA act your account is currently inactive. + +Please print this message out and have your parent or guardian sign and date it. Then fax it to: + +{FAX_INFO} + +OR mail it to: + +{MAIL_INFO} + +------------------------------ CUT HERE ------------------------------ +Permission to Participate at {SITENAME} + +Username: {USERNAME} +Email: {EMAIL_ADDRESS} + +I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. +I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. +I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. + + +Parent or Guardian +(print your name here): _____________________ + +(sign here): __________________ + +Date: _______________ + +------------------------------ CUT HERE ------------------------------ + + +Once the administrator has recived the above form via fax or regular mail your account will be activated. + +Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. + +Thank you for registering. + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index 97e651a488..4aac4ce5bd 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -20,15 +20,6 @@ Username: {USERNAME} Password: {PASSWORD} Email: {EMAIL_ADDRESS} -ICQ Number: {ICQ} -AIM Address: {AIM} -MSN Messenger: {MSN} -Yahoo Messenger: {YIM} -Web Site: {WEB_SITE} -From: {FROM} -Occupation: {OCC} -Interests: {INTERESTS} - I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. |