mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

- adjusted coding guidelines

Browse Source 
- fixed custom bbcode {TEXT} token
- added unapproved item/info for unapproved posts in a topic


git-svn-id: file:///svn/phpbb/trunk@5982 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-05-28 19:15:24 +00:00
parent ebf4f4ec8e
commit 19a36ed364
12 changed files with 95 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/common.php
View File

@@ -312,6 +312,7 @@ $lang = array_merge($lang, array(
'POST_STICKY' => 'Sticky',
'POSTED' => 'Posted',
'POSTS' => 'Posts',
'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved',
'POST_BY_FOE' => 'This post was made by <b>%1$s</b> who is currently on your ignore list. To display this post click %2$sHERE%3$s.',
'POST_DAY' => '%.2f posts per day',
'POST_DETAILS' => 'Post details',

59
phpBB/language/en/ucp.php
View File

@@ -58,35 +58,36 @@ $lang = array_merge($lang, array(
// Common language entries
$lang = array_merge($lang, array(
'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering',
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated',
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password',
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated',
'ACTIVATION_EMAIL_SENT' => 'The activation email has been sent to your email address',
'ADD' => 'Add',
'ADD_BCC' => 'Add [Bcc]',
'ADD_FOES' => 'Add new foes',
'ADD_FOES_EXPLAIN' => 'You may enter several usernames each on a different line',
'ADD_FOLDER' => 'Add folder',
'ADD_FRIENDS' => 'Add new friends',
'ADD_FRIENDS_EXPLAIN' => 'You may enter several usernames each on a different line',
'ADD_NEW_RULE' => 'Add new Rule',
'ADD_RULE' => 'Add Rule',
'ADD_TO' => 'Add [To]',
'ADMIN_EMAIL' => 'Administrators can email me information',
'AGREE' => 'I agree to these terms',
'ALLOW_PM' => 'Allow users to send you private messages',
'ALLOW_PM_EXPLAIN' => 'Note that admins and moderators will always be able to send you messages.',
'ALREADY_ACTIVATED' => 'You have already activated your account',
'ATTACHMENTS_EXPLAIN' => 'This is a list of attachements you have made in posts to this forum.',
'ATTACHMENTS_DELETED' => 'Attachments successfully deleted',
'ATTACHMENT_DELETED' => 'Attachment successfully deleted',
'AVATAR_CATEGORY' => 'Category',
'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.',
'AVATAR_GALLERY' => 'Local gallery',
'AVATAR_PAGE' => 'Page',
'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering',
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated',
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password',
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated',
'ACTIVATION_EMAIL_SENT' => 'The activation email has been sent to your email address',
'ADD' => 'Add',
'ADD_BCC' => 'Add [Bcc]',
'ADD_FOES' => 'Add new foes',
'ADD_FOES_EXPLAIN' => 'You may enter several usernames each on a different line',
'ADD_FOLDER' => 'Add folder',
'ADD_FRIENDS' => 'Add new friends',
'ADD_FRIENDS_EXPLAIN' => 'You may enter several usernames each on a different line',
'ADD_NEW_RULE' => 'Add new Rule',
'ADD_RULE' => 'Add Rule',
'ADD_TO' => 'Add [To]',
'ADMIN_EMAIL' => 'Administrators can email me information',
'AGREE' => 'I agree to these terms',
'ALLOW_PM' => 'Allow users to send you private messages',
'ALLOW_PM_EXPLAIN' => 'Note that admins and moderators will always be able to send you messages.',
'ALREADY_ACTIVATED' => 'You have already activated your account',
'ATTACHMENTS_EXPLAIN' => 'This is a list of attachements you have made in posts to this forum.',
'ATTACHMENTS_DELETED' => 'Attachments successfully deleted',
'ATTACHMENT_DELETED' => 'Attachment successfully deleted',
'AVATAR_CATEGORY' => 'Category',
'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.',
'AVATAR_GALLERY' => 'Local gallery',
'AVATAR_GENERAL_UPLOAD_ERROR' => 'Could not upload avatar to %s',
'AVATAR_PAGE' => 'Page',
'BACK_TO_DRAFTS' => 'Back to saved drafts',
'BACK_TO_LOGIN' => 'Back to login screen',