- 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

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',