- removed db cache (might re-appear, but for now we do not see the need for it)

- all changes to styles/subsilver/template are purely cosmetic (no functional changes)
- cosmetics
- bugfixes
- add index to modules table
- use modules ordering code for forums too


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

phpBB/language/en/acp/board.php

@@ -139,9 +139,9 @@ $lang = array_merge($lang, array(
 	'MAX_POST_FONT_SIZE'			=> 'Max font size per post',
 	'MAX_POST_FONT_SIZE_EXPLAIN'	=> 'Set to 0 for unlimited font size.',
 	'MAX_POST_IMG_HEIGHT'			=> 'Max image height per post',
-	'MAX_POST_IMG_HEIGHT_EXPLAIN'	=> 'Set to 0 for unlimited image height.',
+	'MAX_POST_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.',
 	'MAX_POST_IMG_WIDTH'			=> 'Max image width per post',
-	'MAX_POST_IMG_WIDTH_EXPLAIN'	=> 'Set to 0 for unlimited image width.',
+	'MAX_POST_IMG_WIDTH_EXPLAIN'	=> 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.',
 	'MAX_POST_URLS'					=> 'Max links per post',
 	'MAX_POST_URLS_EXPLAIN'			=> 'Set to 0 for unlimited links.',
 	'POSTING'						=> 'Posting',
@@ -160,9 +160,9 @@ $lang = array_merge($lang, array(
 	'MAX_SIG_FONT_SIZE'				=> 'Maximum signature font size',
 	'MAX_SIG_FONT_SIZE_EXPLAIN'		=> 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.',
 	'MAX_SIG_IMG_HEIGHT'			=> 'Maximum signature image height',
-	'MAX_SIG_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image in user signatures. Set to 0 for unlimited size.',
+	'MAX_SIG_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited size.',
 	'MAX_SIG_IMG_WIDTH'				=> 'Maximum signature image width',
-	'MAX_SIG_IMG_WIDTH_EXPLAIN'		=> 'Maximum width of an image in user signatures. Set to 0 for unlimited size.',
+	'MAX_SIG_IMG_WIDTH_EXPLAIN'		=> 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited size.',
 	'MAX_SIG_LENGTH'				=> 'Maximum signature length',
 	'MAX_SIG_LENGTH_EXPLAIN'		=> 'Maximum number of characters in user signatures.',
 	'MAX_SIG_SMILIES'				=> 'Maximum smilies per signature',
@@ -395,6 +395,8 @@ $lang = array_merge($lang, array(
 $lang = array_merge($lang, array(
 	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use Jabber for instant messaging and board notices. Jabber is an opensource protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Note that it may take several seconds to update Jabber account details, do not stop the script till completed!',
 
+	'ERR_JAB_AUTH'			=> 'Could not authorise on Jabber server',
+	'ERR_JAB_CONNECT'		=> 'Could not connect to Jabber server',
 	'ERR_JAB_PASSCHG'		=> 'Could not change password',
 	'ERR_JAB_PASSFAIL'		=> 'Password update failed, %s',
 	'ERR_JAB_REGISTER'		=> 'An error occured trying to register this account, %s',

phpBB/language/en/acp/common.php

@@ -244,6 +244,7 @@ $lang = array_merge($lang, array(
 	'PROCEED_TO_ACP'		=> 'Click %sHere%s to proceed to the ACP',
 	'REMIND'				=> 'Remind',
 	'REORDER'				=> 'Reorder',
+	'RESYNC'				=> 'Sync',
 	'RETURN_TO'				=> 'Return to ...',
 
 	'SELECT_ANONYMOUS'		=> 'Select Anonymous User',

phpBB/language/en/acp/forums.php

@@ -117,7 +117,6 @@ $lang = array_merge($lang, array(
 	'PRUNE_OLD_POLLS_EXPLAIN'	=> 'Removes topics with polls not voted in for post age days.',
 	
 	'REDIRECT_ACL'	=> 'Now you are able to %sset permissions%s for this forum.',
-	'RESYNC'		=> 'Sync',
 
 	'TYPE_CAT'			=> 'Category',
 	'TYPE_FORUM'		=> 'Forum',

phpBB/language/en/acp/users.php

@@ -57,6 +57,7 @@ $lang = array_merge($lang, array(
 	'MOVE_POSTS_EXPLAIN'	=> 'Please select the forum to which you wish to move all the posts this user has made.',
 
 	'NO_SPECIAL_RANK'		=> 'No special rank assigned',
+	'NOT_MANAGE_FOUNDER'	=> 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',
 
 	'QUICK_TOOLS'			=> 'Quick tools',
 

phpBB/language/en/mcp.php

@@ -207,6 +207,7 @@ $lang = array_merge($lang, array(
 	'NO_POST'				=> 'You have to select a post in order to warn the user for a post',
 	'NO_POST_REPORT'		=> 'This post was not reported.',
 	'NO_POST_SELECTED'		=> 'You must select at least one post to perform this action',
+	'NO_REASON_DISAPPROVAL'	=> 'Please give an appropiate reason for disapproval',
 	'NO_TOPIC_SELECTED'		=> 'You must select at least one topic to perform this action',
 
 	'OTHER_IPS'				=> 'Other IP addresses this user has posted from',

phpBB/language/en/posting.php

@@ -180,6 +180,7 @@ $lang = array_merge($lang, array(
 	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more Options per User than existing poll options',
 	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully',
 
+	'UNABLE_GET_IMAGE_SIZE'		=> 'Accessing the image was impossible or file isn\'t a valid picture.',
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain bbcodes: ',
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you whish this topic to be displayed',
 	'UPDATE_COMMENT'			=> 'Update comment',