diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-27 16:11:47 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-27 16:11:47 -0700 |
| commit | 74363ced870d4114e7570729636875e0258917b3 (patch) | |
| tree | 61bc27831a362994fc96ea90172d50e25d5c76cb /modules/recaptcha/views | |
| parent | 98e9a96ba4d2419e02717369be8c0d886bc35ef7 (diff) | |
| parent | 4828db003f3ee505eb9e6d056cdb142da34b78ff (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD
Conflicts:
modules/slideshow/helpers/slideshow_event.php
Diffstat (limited to 'modules/recaptcha/views')
| -rw-r--r-- | modules/recaptcha/views/admin_recaptcha.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php index 9c2911ef..43b4da8a 100644 --- a/modules/recaptcha/views/admin_recaptcha.html.php +++ b/modules/recaptcha/views/admin_recaptcha.html.php @@ -14,7 +14,7 @@ <div id="gAdminRecaptchaTest" class="gBlock"> <h2> <?= t("reCAPTCHA Test") ?> </h2> <p> - <?= t("If you see a captcha form below, then reCAPTCHA is functioning properly.") ?> + <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?> </p> <div id="gRecaptcha"/> |