From 2299c401378f4dc424aa512a3b4f22bc1c6c513a Mon Sep 17 00:00:00 2001 From: narqelion <> Date: Sun, 7 Nov 2010 00:13:01 +0100 Subject: [PATCH 1/3] [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA. Fixed spelling, punctuation and grammar as well as removed registration specific language from plugin as it can be/is used for form submissions other than registration. PHPBB3-9879 --- phpBB/language/en/captcha_qa.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php index 5cd822b3c4..20bed34158 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -37,8 +37,8 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'CAPTCHA_QA' => 'Q&A CAPTCHA', - 'CONFIRM_QUESTION_EXPLAIN' => 'This question is a means of identifying and preventing automated submissions.', - 'CONFIRM_QUESTION_WRONG' => 'You have provided an invalid answer to the confirmation question.', + '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.', 'QUESTION_ANSWERS' => 'Answers', 'ANSWERS_EXPLAIN' => 'Please enter valid answers to the question, one per line.', @@ -47,15 +47,15 @@ $lang = array_merge($lang, array( 'ANSWER' => 'Answer', 'EDIT_QUESTION' => 'Edit Question', 'QUESTIONS' => 'Questions', - 'QUESTIONS_EXPLAIN' => 'During registration, users will be asked one of the questions specified here. To use this plugin, at least one question must be set in the default language. These questions should be easy for your target audience to answer, but beyond the ability of a bot capable of running a Google™ search. Using a large and regulary changed set of questions will yield the best results. Enable the strict setting if your question relies on punctuation or capitalisation.', + 'QUESTIONS_EXPLAIN' => 'For every form submission where you have enabled the Q & A CAPTCHA, users will be asked one of the questions specified here. To use this plugin at least one question must be set in the default language. These questions should be easy for your target audience to answer but beyond the ability of a bot capable of running a Google™ search. Using a large and regularly changed set of questions will yield the best results. Enable the strict setting if your question relies on mixed case, punctuation or whitespace.', 'QUESTION_DELETED' => 'Question deleted', 'QUESTION_LANG' => 'Language', - 'QUESTION_LANG_EXPLAIN' => 'The language that this question and its answers are written in.', + 'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers are written in.', 'QUESTION_STRICT' => 'Strict check', - 'QUESTION_STRICT_EXPLAIN' => 'If enabled, capitalisation and whitespace will also be enforced.', + 'QUESTION_STRICT_EXPLAIN' => 'Enable to enforce mixed case, punctuation and whitespace.', 'QUESTION_TEXT' => 'Question', - 'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.', + 'QUESTION_TEXT_EXPLAIN' => 'The question presented to the user.', '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.', From 5d9a9d68744e083997dea9ea9773b98241109b79 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 7 Nov 2010 00:35:11 +0100 Subject: [PATCH 2/3] [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency. PHPBB3-9879 --- phpBB/language/en/captcha_qa.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php index 20bed34158..f503a1ac40 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -47,7 +47,7 @@ $lang = array_merge($lang, array( 'ANSWER' => 'Answer', 'EDIT_QUESTION' => 'Edit Question', 'QUESTIONS' => 'Questions', - 'QUESTIONS_EXPLAIN' => 'For every form submission where you have enabled the Q & A CAPTCHA, users will be asked one of the questions specified here. To use this plugin at least one question must be set in the default language. These questions should be easy for your target audience to answer but beyond the ability of a bot capable of running a Google™ search. Using a large and regularly changed set of questions will yield the best results. Enable the strict setting if your question relies on mixed case, punctuation or whitespace.', + 'QUESTIONS_EXPLAIN' => 'For every form submission where you have enabled the Q&A CAPTCHA, users will be asked one of the questions specified here. To use this plugin at least one question must be set in the default language. These questions should be easy for your target audience to answer but beyond the ability of a bot capable of running a Google™ search. Using a large and regularly changed set of questions will yield the best results. Enable the strict setting if your question relies on mixed case, punctuation or whitespace.', 'QUESTION_DELETED' => 'Question deleted', 'QUESTION_LANG' => 'Language', 'QUESTION_LANG_EXPLAIN' => 'The language this question and its answers are written in.', From 71b35a924f7a5f517e8d07d975582c27813f5797 Mon Sep 17 00:00:00 2001 From: narqelion <> Date: Sun, 7 Nov 2010 01:25:35 +0000 Subject: [PATCH 3/3] [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins. With the addition of CAPTCHA plugins in 3.0.6 a number of language strings need updating to account for non visual based CAPTCHAs. PHPBB3-9095 --- phpBB/language/en/acp/board.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 77deba6e19..05c8b80b17 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -233,7 +233,7 @@ $lang = array_merge($lang, array( 'PASSWORD_LENGTH' => 'Password length', 'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.', 'REG_LIMIT' => 'Registration attempts', - 'REG_LIMIT_EXPLAIN' => 'Number of attempts users can make at the confirmation code before being locked out that session.', + 'REG_LIMIT_EXPLAIN' => 'Number of attempts users can make at solving the CAPTCHA before being locked out of that session.', 'USERNAME_ALPHA_ONLY' => 'Alphanumeric only', 'USERNAME_ALPHA_SPACERS' => 'Alphanumeric and spacers', 'USERNAME_ASCII' => 'ASCII (no international unicode)', @@ -288,7 +288,7 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( - 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure CAPTCHA plugins, which implement various ways to reject registration attempts from so-called spambots.', + 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure CAPTCHA plugins, which are designed to block automated form submissions by spambots.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.', 'CAPTCHA_GD' => 'GD CAPTCHA', @@ -320,12 +320,12 @@ $lang = array_merge($lang, array( 'CONFIGURE' => 'Configure', 'CAPTCHA_NO_OPTIONS' => 'This CAPTCHA has no configuration options.', - 'VISUAL_CONFIRM_POST' => 'Enable visual confirmation for guest postings', - 'VISUAL_CONFIRM_POST_EXPLAIN' => 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.', - 'VISUAL_CONFIRM_REG' => 'Enable visual confirmation for registrations', - 'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to enter a random code matching an image to help prevent mass registrations.', - 'VISUAL_CONFIRM_REFRESH' => 'Enable users to refresh the confirmation image', - 'VISUAL_CONFIRM_REFRESH_EXPLAIN' => 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration. Some plugins might not support this option.', + 'VISUAL_CONFIRM_POST' => 'Enable CAPTCHA for guest postings', + 'VISUAL_CONFIRM_POST_EXPLAIN' => 'Requires guest users to solve a CAPTCHA to help prevent automated postings.', + 'VISUAL_CONFIRM_REG' => 'Enable CAPTCHA for registrations', + 'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to solve a CAPTCHA to help prevent automated registrations.', + 'VISUAL_CONFIRM_REFRESH' => 'Enable users to refresh the CAPTCHA', + 'VISUAL_CONFIRM_REFRESH_EXPLAIN' => 'Allows users to request a new CAPTCHA if they are unable to solve the CAPTCHA during registration. Some plugins might not support this option.', )); // Cookie Settings @@ -463,7 +463,7 @@ $lang = array_merge($lang, array( 'IP_VALID' => 'Session IP validation', 'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking. On IPv6 addresses A.B.C compares the first 4 blocks and A.B the first 3 blocks.', 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts', - 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation).', + 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'After this number of failed logins the user needs to additionally solve the CAPTCHA.', 'NO_IP_VALIDATION' => 'None', 'NO_REF_VALIDATION' => 'None', 'PASSWORD_TYPE' => 'Password complexity',