Merge "Rename button for submitting objectionable content (Bug 946726)"

htdocs/lang/en.utf8/view.php

@@ -128,8 +128,8 @@ $string['alreadyinwatchlist'] = 'This page is already in your watchlist';
 $string['attachedfileaddedtofolder'] = "The attached file %s has been added to your '%s' folder.";
 $string['complaint'] = 'Complaint';
 $string['date'] = 'Date';
-$string['notifysiteadministrator'] = 'Notify site administrator';
-$string['notifysiteadministratorconfirm'] = 'Are you sure you wish to report this page as containing objectionable material?';
+$string['notifyadministrator'] = 'Notify administrator';
+$string['notifyadministratorconfirm'] = 'Are you sure you wish to report this page as containing objectionable material?';
 $string['print'] = 'Print';
 $string['reportobjectionablematerial'] = 'Report objectionable material';
 $string['reportsent'] = 'Your report has been sent';

htdocs/lib/view.php

@@ -4266,8 +4266,8 @@ function objection_form() {
     );
     $form['elements']['submit'] = array(
         'type'  => 'submitcancel',
-        'value' => array(get_string('notifysiteadministrator', 'view'), get_string('cancel')),
-        'confirm' => array(get_string('notifysiteadministratorconfirm', 'view')),
+        'value' => array(get_string('notifyadministrator', 'view'), get_string('cancel')),
+        'confirm' => array(get_string('notifyadministratorconfirm', 'view')),
     );
     return $form;
 }