diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-06-10 12:28:41 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-06-10 12:28:41 +0000 |
| commit | 41a2f0fb03a433ad98d0c96acdd7215f1b94da60 (patch) | |
| tree | 36f6c2cd9a7d4792353e39c544bb7c4a1d0278d0 | |
| parent | 7650b6526f6338236ce41640896015b9e17e4c0f (diff) | |
| download | forums-41a2f0fb03a433ad98d0c96acdd7215f1b94da60.tar forums-41a2f0fb03a433ad98d0c96acdd7215f1b94da60.tar.gz forums-41a2f0fb03a433ad98d0c96acdd7215f1b94da60.tar.bz2 forums-41a2f0fb03a433ad98d0c96acdd7215f1b94da60.tar.xz forums-41a2f0fb03a433ad98d0c96acdd7215f1b94da60.zip | |
language collision
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9568 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php index 36cbaf7d79..4198dcdf5b 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php @@ -52,7 +52,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha function get_name() { - return 'CAPTCHA_GD_WAVE'; + return 'CAPTCHA_GD_3D'; } function get_class_name() diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index c1d6e7fbeb..aac05bc8c1 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -237,7 +237,7 @@ $lang = array_merge($lang, array( 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD CAPTCHA', - 'CAPTCHA_GD_WAVE' => 'GD Wave Captcha', + 'CAPTCHA_GD_3D' => 'GD 3D Captcha', 'CAPTCHA_GD_FOREGROUND_NOISE' => 'GD CAPTCHA foreground noise', 'CAPTCHA_GD_EXPLAIN' => 'Use GD to make a more advanced CAPTCHA.', 'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN' => 'Use foreground noise to make the GD based CAPTCHA harder.', |