- do not allow setting the parent to currently assigned childs [Bug #6708]

- Allow the display_on_index setting to be specified for link forums [Bug #6660]
- Rank code in functions_display.php [Bug #6656]
- Added some new locations for the viewonline page [Related to bug #6484]
- Do not display attached images inline if user disabled image display in posts; the same with flash files [Bug #6226]


git-svn-id: file:///svn/phpbb/trunk@6829 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/common.php

@@ -103,6 +103,8 @@ $lang = array_merge($lang, array(
 	'CANCEL'				=> 'Cancel',
 	'CHANGE'				=> 'Change',
 	'CHANGE_FONT_SIZE'		=> 'Change font size',
+	'CHANGING_PREFERENCES'	=> 'Changing forum preferences',
+	'CHANGING_PROFILE'		=> 'Changing forum profile settings',
 	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
 	'CLOSE_WINDOW'			=> 'Close window',
 	'COLOUR_SWATCH'			=> 'Colour swatch',
@@ -367,6 +369,7 @@ $lang = array_merge($lang, array(
 	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
 	'PM'					=> 'PM',
 	'POSTING_MESSAGE'		=> 'Posting message in %s',
+	'POSTING_PRIVATE_MESSAGE'	=> 'Composing private message',
 	'POST'					=> 'Post',
 	'POST_ANNOUNCEMENT'		=> 'Announce',
 	'POST_STICKY'			=> 'Sticky',
@@ -397,6 +400,7 @@ $lang = array_merge($lang, array(
 
 	'READING_FORUM'				=> 'Viewing topics in %s',
 	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
+	'READING_LINK'				=> 'Following forum link %s',
 	'READING_TOPIC'				=> 'Reading topic in %s',
 	'READ_PROFILE'				=> 'Profile',
 	'REASON'					=> 'Reason',
@@ -579,7 +583,10 @@ $lang = array_merge($lang, array(
 	'VIEWING_FAQ'				=> 'Viewing FAQ',
 	'VIEWING_MEMBERS'			=> 'Viewing member details',
 	'VIEWING_ONLINE'			=> 'Viewing who is online',
+	'VIEWING_MCP'				=> 'Viewing moderator control panel',
 	'VIEWING_MEMBER_PROFILE'	=> 'Viewing member profile',
+	'VIEWING_PRIVATE_MESSAGES'	=> 'Viewing private messages',
+	'VIEWING_REGISTER'			=> 'Registering account',
 	'VIEWING_UCP'				=> 'Viewing user control panel',
 	'VIEWS'						=> 'Views',
 	'VIEW_BOOKMARKS'			=> 'View bookmarks',