aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-18 14:24:00 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-18 14:24:00 +0200
commit2217ab7abeb78dba41b64dc229b8486701fe2c3b (patch)
treea74d5095377f63822025674bc997314b53012cc5
parent7548bc89eaefcc1e4774cf7aa1a827600ede5487 (diff)
parent3066cd700a72dc0bb00611c8650e83c8a8a81d18 (diff)
downloadforums-2217ab7abeb78dba41b64dc229b8486701fe2c3b.tar
forums-2217ab7abeb78dba41b64dc229b8486701fe2c3b.tar.gz
forums-2217ab7abeb78dba41b64dc229b8486701fe2c3b.tar.bz2
forums-2217ab7abeb78dba41b64dc229b8486701fe2c3b.tar.xz
forums-2217ab7abeb78dba41b64dc229b8486701fe2c3b.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12961] Shorten ext-db link text [ticket/12961] Fix missing phpBB.com [ticket/12961] Remove target="_blank" and switch to <strong> [ticket/12961] Add additional link to the KB [ticket/12961] Move link to language file [ticket/12961] Refactor lang entry [ticket/12961] Change url to anti-spam-ext [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/ [ticket/12961] Add link in anti-spam ACP page to titania
-rw-r--r--phpBB/adm/style/acp_captcha.html1
-rw-r--r--phpBB/language/en/acp/board.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index df4c675209..f4866653c3 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -6,6 +6,7 @@
<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
+<p>{L_ACP_VC_EXT_GET_MORE}</p>
<form id="acp_captcha" method="post" action="{U_ACTION}">
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index d451bdd515..24cfe4556b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,6 +298,7 @@ $lang = array_merge($lang, array(
// Visual Confirmation Settings
$lang = array_merge($lang, array(
'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
+ 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com Extensions Database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>phpBB.com Knowledge Base</strong></a>.',
'AVAILABLE_CAPTCHAS' => 'Available plugins',
'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.',
'CAPTCHA_GD' => 'GD image',