aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-05-30 04:27:14 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-05-30 04:27:14 +0000
commit74799e168de336d6aaddb43606772282c3319e09 (patch)
treee9eba88da220549fc22c025715b87692f67baa44 /phpBB/language
parent5465ceb5071d2b58609ae68004e453334d569649 (diff)
downloadforums-74799e168de336d6aaddb43606772282c3319e09.tar
forums-74799e168de336d6aaddb43606772282c3319e09.tar.gz
forums-74799e168de336d6aaddb43606772282c3319e09.tar.bz2
forums-74799e168de336d6aaddb43606772282c3319e09.tar.xz
forums-74799e168de336d6aaddb43606772282c3319e09.zip
- 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
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php11
-rw-r--r--phpBB/language/en/common.php2
2 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1b19b4e0ba..5885cfab0d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/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',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5f8af917d9..97969eb714 100644
--- a/phpBB/language/en/common.php
+++ b/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',