Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/recaptcha/libraries/Form_Recaptcha.php b/modules/recaptcha/libraries/Form_Recaptcha.php
index 4c0c4997..f4e9d4ac 100644
--- a/modules/recaptcha/libraries/Form_Recaptcha.php
+++ b/modules/recaptcha/libraries/Form_Recaptcha.php
@@ -28,7 +28,7 @@ class Form_Recaptcha_Core extends Form_Input {
   public function __construct($name) {
     parent::__construct($name);
     $this->error_messages("incorrect-captcha-sol",
-                          t("The values supplied to recaptcha are incorrect."));
+                          t("The values supplied to reCAPTCHA are incorrect."));
     $this->error_messages("invalid-site-private-key", t("The site private key is incorrect."));
   }