diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:43:05 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:43:05 +0100 |
| commit | e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a (patch) | |
| tree | c1717f0d5a98ea7edcdfc60809b894eca282e327 /phpBB/language | |
| parent | 8d989810121e3baf315ceaf8d9cd225317a625d9 (diff) | |
| parent | 6774c5077ddf82eb2f31e92d327ce6905b73c3df (diff) | |
| download | forums-e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a.tar forums-e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a.tar.gz forums-e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a.tar.bz2 forums-e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a.tar.xz forums-e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14241] Log fatal captcha error to error log
[ticket/14241] Prevent empty q&a as a result of improper settings
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/captcha_qa.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 4a70aafc6f..3d1ab7f873 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -606,6 +606,7 @@ $lang = array_merge($lang, array( 'LOG_ERROR_JABBER' => '<strong>Jabber error</strong><br />» %s', 'LOG_ERROR_EMAIL' => '<strong>Email error</strong><br />» %s', + 'LOG_ERROR_CAPTCHA' => '<strong>CAPTCHA error</strong><br />» %s', 'LOG_FORUM_ADD' => '<strong>Created new forum</strong><br />» %s', 'LOG_FORUM_COPIED_PERMISSIONS' => '<strong>Copied forum permissions</strong> from %1$s<br />» %2$s', diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php index f764a83f24..28011eb636 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -40,6 +40,7 @@ $lang = array_merge($lang, array( 'CAPTCHA_QA' => 'Q&A', 'CONFIRM_QUESTION_EXPLAIN' => 'This question is a means of preventing automated form submissions by spambots.', 'CONFIRM_QUESTION_WRONG' => 'You have provided an invalid answer to the question.', + 'CONFIRM_QUESTION_MISSING' => 'Questions for the captcha could not be retrieved. Please contact a board administrator.', 'QUESTION_ANSWERS' => 'Answers', 'ANSWERS_EXPLAIN' => 'Please enter valid answers to the question, one per line.', @@ -60,5 +61,4 @@ $lang = array_merge($lang, array( 'QA_ERROR_MSG' => 'Please fill in all fields and enter at least one answer.', 'QA_LAST_QUESTION' => 'You cannot delete all questions while the plugin is active.', - )); |