From e7a17a34295106391cb1803070dccb9e7a419d86 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 19 Jul 2009 22:21:50 +0000 Subject: Set some svn properties. Cleanup. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9799 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/captcha_default_acp_demo.html | 3 +-- phpBB/adm/style/captcha_qa_acp_demo.html | 4 ++-- phpBB/adm/style/captcha_recaptcha.html | 22 +++++++++---------- phpBB/language/en/captcha_qa.php | 6 ++---- phpBB/language/en/recaptcha.php | 3 +-- phpBB/styles/prosilver/template/captcha_qa.html | 4 +--- .../prosilver/template/captcha_recaptcha.html | 25 +++++++++++----------- .../prosilver/template/quickreply_editor.html | 1 - 8 files changed, 30 insertions(+), 38 deletions(-) diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index a714386e51..0b1434f7e0 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,5 +1,4 @@ -

{L_CAPTCHA_PREVIEW_EXPLAIN}
{L_PREVIEW}
-
\ No newline at end of file + diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 919d4d48d5..474dfc58ea 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,7 +1,7 @@

{L_CONFIRM_QUESTION_EXPLAIN}
- +
- +
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 0cb43cf01f..93fc6e7499 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -1,5 +1,5 @@ -
+
- - -
{L_RECAPTCHA_NOT_AVAILABLE} - \ No newline at end of file + diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php index 1eee68fb96..ac1aa4ab1c 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -4,8 +4,8 @@ * recaptcha [English] * * @package language -* @version $Id: recaptcha.php 9709 2009-06-30 14:23:16Z Kellanved $ -* @copyright (c) 2008 phpBB Group +* @version $Id$ +* @copyright (c) 2009 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -57,8 +57,6 @@ $lang = array_merge($lang, array( 'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.', 'QA_ERROR_MSG' => 'Please fill out all fields and enter at least one answer.', - - )); ?> \ No newline at end of file diff --git a/phpBB/language/en/recaptcha.php b/phpBB/language/en/recaptcha.php index e0c3db98b7..25802d3a9f 100644 --- a/phpBB/language/en/recaptcha.php +++ b/phpBB/language/en/recaptcha.php @@ -5,7 +5,7 @@ * * @package language * @version $Id$ -* @copyright (c) 2008 phpBB Group +* @copyright (c) 2009 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -47,7 +47,6 @@ $lang = array_merge($lang, array( 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. You can obtain keys from reCaptcha.net.', 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field underneath.', - )); ?> \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index 52df6fac4a..e363ee008d 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -4,11 +4,10 @@

{L_CONFIRMATION}

-
-
:
{L_CONFIRM_QUESTION_EXPLAIN}
+
:
{L_CONFIRM_QUESTION_EXPLAIN}
@@ -20,4 +19,3 @@ - diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index 431124a210..510a1d3124 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -6,13 +6,13 @@

{L_CONFIRM_EXPLAIN}

- +
-
:
{L_RECAPTCHA_EXPLAIN}
+
:
{L_RECAPTCHA_EXPLAIN}
- + - - -
{L_RECAPTCHA_NOT_AVAILABLE} +
- diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index 22d90cdd90..4fca4b0dfd 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -11,7 +11,6 @@ // ]]>
-
-- cgit v1.2.1