diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-22 16:18:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-22 16:18:40 +0000 |
| commit | 856650861f0c454b800fe816ba2592444ef13894 (patch) | |
| tree | d73a41902d1d58784c7502c94ce4d03998131e0a /phpBB/language/en/common.php | |
| parent | 68c349fdc1ad29ff3c80961297db31b1e725973f (diff) | |
| download | forums-856650861f0c454b800fe816ba2592444ef13894.tar forums-856650861f0c454b800fe816ba2592444ef13894.tar.gz forums-856650861f0c454b800fe816ba2592444ef13894.tar.bz2 forums-856650861f0c454b800fe816ba2592444ef13894.tar.xz forums-856650861f0c454b800fe816ba2592444ef13894.zip | |
- removed group settings from roles
- added forum icon in front of forums in permissions acp
- added trace permissions in permission masks (thanks naderman for writing the first code and for the idea... :))
- some bugfixes
- PHP6 fix
git-svn-id: file:///svn/phpbb/trunk@5824 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 43289507b4..88c50c7858 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -147,6 +147,7 @@ $lang = array_merge($lang, array( 'FORUMS' => 'Forums', 'FORUMS_MARKED' => 'All forums have been marked read', 'FORUM_INDEX' => 'Board Index', + 'FORUM_LINK' => 'Forum Link', 'FORUM_LOCATION' => 'Forum Location', 'FORUM_LOCKED' => 'Forum Locked', 'FORUM_RULES' => 'Forum Rules', @@ -370,6 +371,7 @@ $lang = array_merge($lang, array( 'REPORTING_POST' => 'Reporting post', 'RESEND_ACTIVATION' => 'Resend activation email', 'RESET' => 'Reset', + 'RESTORE_PERMISSIONS' => 'Restore Permissions', 'RETURN_INDEX' => 'Click %sHere%s to return to the index', 'RETURN_FORUM' => 'Click %sHere%s to return to the forum', 'RETURN_PAGE' => 'Click %sHere%s to return to the previous page', @@ -397,13 +399,14 @@ $lang = array_merge($lang, array( 'SEARCH_ADV_EXPLAIN' => 'View the advanced search options', 'SEARCH_KEYWORDS' => 'Enter search keywords', 'SEARCHING_FORUMS' => 'Searching forums', - 'SELECT_DESTINATION_FORUM' => 'Please select a forum for destination', 'SEARCH_ACTIVE_TOPICS' => 'View active topics', 'SEARCH_FOR' => 'Search for', 'SEARCH_NEW' => 'View new posts', 'SEARCH_SELF' => 'View your posts', 'SEARCH_UNANSWERED' => 'View unanswered posts', + 'SECONDS' => 'Seconds', 'SELECT' => 'Select', + 'SELECT_DESTINATION_FORUM' => 'Please select a forum for destination', 'SELECT_FORUM' => 'Select a forum', 'SEND_EMAIL' => 'Email', 'SEND_PRIVATE_MESSAGE' => 'Send private message', |