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

- added delete cookies link

Browse Source 
- fixed global announcement links in viewforum
- do not display redirects in link forums as posts in forum overview


git-svn-id: file:///svn/phpbb/trunk@4904 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2004-05-31 18:00:10 +00:00
parent 6aa42b69ab
commit 2c470e4b27
19 changed files with 158 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/language/en/admin.php
View File

@@ -606,10 +606,32 @@ $lang += array(
// Message Settings
$lang += array(
'MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging',
'BOXES_MAX' => 'Max private message folders',
'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages..',
'BOXES_LIMIT' => 'Max private messages per box',
'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',
'FULL_FOLDER_ACTION' => 'Full folder default action',
'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the special folder "SENTBOX" the default action is always deleting old messages.',
'HOLD_NEW_MESSAGES' => 'Hold new messages',
'PM_EDIT_TIME' => 'Limit editing time',
'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity',
'ALLOW_MASS_PM' => 'Allow Mass PM\'s',
'ALLOW_HTML_PM' => 'Allow HTML in private messages',
'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages',
'ALLOW_SMILIES_PM' => 'Allow smilies in private messages',
'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages',
'ALLOW_SIG_PM' => 'Allow signatures in private messages',
'ALLOW_REPORT_PM' => 'Allow reporting of private messages',
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
'ALLOW_QUOTE_PM' => 'Allow quoting of private messages',
'ALLOW_PRINT_PM' => 'Allow print view in private messaging',
'ALLOW_EMAIL_PM' => 'Allow emailing private messages',
'ALLOW_IMG_PM' => 'Allow use of IMG BBCode Tag',
'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag',
'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages'
);
// Cookie settings

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

@@ -78,11 +78,13 @@ $lang += array(
'CLICK_VIEW_PRIVMSG' => 'Click %sHere%s to visit your Inbox',
'CONFIRM' => 'Confirm',
'CONGRATULATIONS' => 'Congratulations to',
'COOKIES_DELETED' => 'All Board Cookies successfully deleted.',
'CURRENT_TIME' => 'The time is %s',
'DAY' => 'Day',
'DAYS' => 'Days',
'DELETE' => 'Delete',
'DELETE_COOKIES' => 'Delete all board cookies',
'DELETE_MARKED' => 'Delete Marked',
'DESCENDING' => 'Descending',
'DISABLED' => 'Disabled',

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

@@ -100,6 +100,7 @@ $lang += array(
'DELETE_AVATAR' => 'Delete Image',
'DELETE_MARKED_PM' => 'Delete Marked Messages',
'DELETE_MARKED_PM_CONFIRM' => 'Are you sure you want to delete all marked messages?',
'DELETE_OLDEST_MESSAGES' => 'Delete Oldest Messages',
'DELETE_PM' => 'Delete PM',
'DELETE_RULE' => 'Delete Rule',
'DELETE_RULE_CONFIRM' => 'Are you sure you want to delete this rule?',
@@ -136,6 +137,7 @@ $lang += array(
'FULL_FOLDER_OPTION_CHANGED'=> 'Full Folder Option changed successfully',
'HIDE_ONLINE' => 'Hide my online status',
'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)',
'IF_FOLDER_FULL' => 'If Folder Full',
'IMPORTANT_NEWS' => 'Important announcements',