Recaptcha keys are now called "site key" and "secret key"

Bug 1411459: Google's site that issues recaptcha keys calls them
"site" and "secret" instead of "public" and "private".
We should do the same, to avoid confusing users.

Change-Id: I591f267ccce440459d3033bed04215a65bcb46cf

htdocs/admin/site/options.php

@@ -442,15 +442,15 @@ $siteoptionform = array(
                 ),
                 'recaptchapublickey' => array(
                     'type' => 'text',
-                    'title' => get_string('recaptchapublickey', 'admin'),
-                    'description' => get_string('recaptchapublickeydesc', 'admin'),
+                    'title' => get_string('recaptchapublickey1', 'admin'),
+                    'description' => get_string('recaptchapublickeydesc1', 'admin'),
                     'defaultvalue' => get_config('recaptchapublickey'),
                     'disabled' => in_array('recaptchapublickey', $OVERRIDDEN)
                 ),
                 'recaptchaprivatekey' => array(
                     'type' => 'text',
-                    'title' => get_string('recaptchaprivatekey', 'admin'),
-                    'description' => get_string('recaptchaprivatekeydesc', 'admin'),
+                    'title' => get_string('recaptchaprivatekey1', 'admin'),
+                    'description' => get_string('recaptchaprivatekeydesc1', 'admin'),
                     'defaultvalue' => get_config('recaptchaprivatekey'),
                     'disabled' => in_array('recaptchaprivatekey', $OVERRIDDEN)
                 ),
@@ -888,7 +888,7 @@ function siteoptions_submit(Pieform $form, $values) {
         $form->reply(
             PIEFORM_ERR,
             array(
-                'message' => get_string('recaptchakeysmissing', 'admin'),
+                'message' => get_string('recaptchakeysmissing1', 'admin'),
                 'goto' => '/admin/site/options.php',
             )
         );

htdocs/lang/en.utf8/admin.php

@@ -362,14 +362,14 @@ $string['licenseallowcustom'] = 'Allow custom licenses';
 $string['licenseallowcustomdescription'] = "For license metadata, allow users to enter any URL as the license. If not checked, users will be limited to the licenses configured by the site administrator.";
 $string['allowmobileuploads'] = 'Allow mobile uploads';
 $string['allowmobileuploadsdescription'] = 'If checked, users will have the option of setting an authentication token. Content uploaded with this token will be saved as artefacts.';
-$string['recaptchakeysmissing'] = 'reCAPTCHA is turned on, but it will not function until you also provide a private and public key.';
+$string['recaptchakeysmissing1'] = 'reCAPTCHA is turned on, but it will not function until you also provide a site key and secret key.';
 $string['recaptchanotpassed'] = 'The reCAPTCHA wasn\'t entered correctly. Please try it again.';
 $string['recaptchaonregisterform'] = 'reCAPTCHA on user registration form';
 $string['recaptchaonregisterformdesc'] = 'If checked, users self-registering a new account will have to prove themselves human by passing a <a href="http://recaptcha.org/">reCAPTCHA</a> test.';
-$string['recaptchaprivatekey'] = 'reCAPTCHA private key';
-$string['recaptchaprivatekeydesc'] = 'The private key for your site\'s reCAPTCHA account.';
-$string['recaptchapublickey'] = 'reCAPTCHA public key';
-$string['recaptchapublickeydesc'] = 'The public key for your site\'s reCAPTCHA account.';
+$string['recaptchaprivatekey1'] = 'reCAPTCHA secret key';
+$string['recaptchaprivatekeydesc1'] = 'The secret key for your site\'s reCAPTCHA account.';
+$string['recaptchapublickey1'] = 'reCAPTCHA site key';
+$string['recaptchapublickeydesc1'] = 'The site key for your site\'s reCAPTCHA account.';
 $string['remoteavatars'] = 'Display remote avatars';
 $string['remoteavatarsdescription'] = 'If checked, the <a href="http://www.gravatar.com">Gravatar</a> service will be used for users\' default profile pictures.';
 $string['searchplugin'] = 'Search plugin';

htdocs/lang/en.utf8/help/forms/siteoptions.recaptchaonregisterform.html

@@ -3,5 +3,5 @@
 <h3>reCAPTCHA on register form</h3>
 <p>If checked, users self-registering a new account will have to prove themselves human by passing a reCAPTCHA test.
 This should prevent spam accounts from being created by an automated script.</p>
-<p>In order for this feature to work, you will also need to provide a reCAPTCHA public and private key. You can obtain these from the reCAPTCHA
+<p>In order for this feature to work, you will also need to provide a reCAPTCHA site key and secret key. You can obtain these from the reCAPTCHA
 website, <a href="http://recaptcha.org">http://recaptcha.org</a>.</p>