Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle

Conflicts:
	lang/en/deprecated.txt
	lang/en/grades.php

diff --cc lang/en/admin.php
Simple merge

diff --cc lang/en/grades.php
Simple merge

diff --cc lang/en/hub.php
index 3b5d5c8,c4bc8ba..76c1b81
--- 1/lang/en/hub.php
--- 2/lang/en/hub.php
+++ b/lang/en/hub.php
@@@ -95,10 -95,10 +95,10 @@@ $string['errorcoursepublish'] = 'An err
  $string['errorcoursewronglypublished'] = 'A publication error has been returned by the hub. Please try again later.';
  $string['errorcron'] = 'An error occurred during registration update on "{$a->hubname}" ({$a->errormessage})';
  $string['errorcronnoxmlrpc'] = 'XML-RPC must be enabled in order to update the registration.';
 -$string['errorhublisting'] = 'An error occurred when retrieving the hub listing from Moodle.org, please try again later. ({$a})';
 +$string['errorhublisting'] = 'An error occurred when retrieving the hub listing from Moodle. Please try again later. ({$a})';
  $string['errorlangnotrecognized'] = 'The provided language code is unknown by Moodle. Please contact {$a}';
  $string['errorregistration'] = 'An error occurred during registration, please try again later. ({$a})';
- $string['errorunpublishcourses']= 'Due to an unexpected error, the courses could not be deleted on the hub. Try again later (recommended) or contact the hub administrator.';
+ $string['errorunpublishcourses'] = 'Due to an unexpected error, the courses could not be deleted on the hub. Try again later (recommended) or contact the hub administrator.';
  $string['existingscreenshotnumber'] = '{$a} existing screenshots. You will be able to see these screenshots on this page, only once the hub administrator enables your course.';
  $string['existingscreenshots'] = 'Existing screenshots';
  $string['forceunregister'] = 'Yes, clean registration data';

diff --cc lang/en/moodle.php
Simple merge