- We are now at _seven_ different policies, not counting the non-GD version. We must remove something...

- Made the CAPTCHA system idiot proof, disabling all the policies still lets an image get created.
- We handle the case of a user having GD but no TTF. Thankfully, we have CAPTCHAs that don't need TTF!
- Fixed that stupid language string...
- Renamed Occlude to Overlap
- Shape is now only enabled if TTF support is detected


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

phpBB/language/en/acp/board.php

@@ -88,16 +88,21 @@ $lang = array_merge($lang, array(
 	'BOXES_LIMIT_EXPLAIN'		=> 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',
 
 	'CAPTCHA_OPTIONS'			=> 'Captcha Options',
-	'CAPTCHA_OCCLUDE'			=> 'Occlude',
+
+	'CAPTCHA_OVERLAP'			=> 'Overlap',
 	'CAPTCHA_ENTROPY'			=> 'Entropy',
 	'CAPTCHA_SHAPE'				=> 'Shape',
 	'CAPTCHA_3DBITMAP'			=> '3D Bitmap',
+	'CAPTCHA_CELLS'				=> 'Cells',
+	'CAPTCHA_STENCIL'			=> 'Stencil',
+	'CAPTCHA_COMPOSITE'			=> 'Composite',
+
 	'ENTROPY_NOISE_PIXEL'		=> 'Entropy pixel noise',
 	'ENTROPY_NOISE_LINE'		=> 'Entropy line noise',
 	'SHAPE_NOISE_PIXEL'			=> 'Shape pixel noise',
 	'SHAPE_NOISE_LINE'			=> 'Shape line noise',
-	'OCCLUDE_NOISE_PIXEL'		=> 'Occlude pixel noise',
-	'OCCLUDE_NOISE_LINE'		=> 'Occlude line noise',
+	'OVERLAP_NOISE_PIXEL'		=> 'Overlap pixel noise',
+	'OVERLAP_NOISE_LINE'		=> 'Overlap line noise',
 	'HEAVY'						=> 'Heavy',
 	'MEDIUM'					=> 'Medium',
 	'LIGHT'						=> 'Light',

phpBB/language/en/common.php

@@ -95,7 +95,7 @@ $lang = array_merge($lang, array(
 	'CLOSE_WINDOW'			=> 'Close window',
 	'CONFIRM'				=> 'Confirm',
 	'CONFIRM_CODE'			=> 'Confirmation code',
-	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case sensitive, zero has a diagonal line through it.',
+	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case insensitive.',
 	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed',