Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle

diff --cc admin/tool/analytics/lang/en/tool_analytics.php
Simple merge

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

diff --cc lang/en/deprecated.txt
Simple merge

diff --cc lang/en/hub.php
index 1ce9b7c,08aa958..016b1fa
--- 1/lang/en/hub.php
--- 2/lang/en/hub.php
+++ b/lang/en/hub.php
@@@ -115,9 -114,12 +115,10 @@@ $string['postaladdress'] = 'Postal addr
  $string['postaladdress_help'] = 'Postal address of this site, or of the entity represented by this site.';
  $string['postsnumber'] = 'Number of posts ({$a})';
  $string['previousregistrationdeleted'] = 'The previous registration has been deleted from {$a}. You can restart the registration process. Thank you.';
 -$string['privacy'] = 'Privacy';
 -$string['privacy_help'] = 'The hub may want to display a list of registered sites. If it does then you can choose whether or not you want to appear on that list.';
  $string['publicationinfo'] = 'Course publication information';
- $string['publishcourse'] = 'Publish {$a}';
- $string['publishcourseon'] = 'Publish on {$a}';
+ $string['publish'] = 'Share';
+ $string['publishcourse'] = 'Share {$a}';
+ $string['publishcourseon'] = 'Share on {$a}';
  $string['publishedon'] = 'Publications';
  $string['publisheremail'] = 'Publisher email';
  $string['publisheremail_help'] = 'The publisher email address allows the hub administrator to alert the publisher about any changes to the status of the published course.';
@@@ -148,23 -150,19 +149,23 @@@ $string['sent'] = '...finished'
  $string['share'] = 'Share this course for people to download';
  $string['shared'] = 'Shared';
  $string['shareon'] = 'Upload this course to {$a}';
- $string['sharepublication_help'] = 'Uploading this course to a community server will enable people to download it and install it on their own Moodle sites.';
+ $string['sharepublication_help'] = 'A backup of this course will be available on Moodle.net for people to restore and use on their own site.';
  $string['siteadmin'] = 'Administrator';
  $string['siteadmin_help'] = 'The full name of the site administrator.';
 +$string['sitecommnews'] = 'Updates about Moodle news and features';
 +$string['sitecommnews_help'] = 'You have the option of subscribing to our low volume email list including a newsletter about happenings in the Moodle community. ';
 +$string['sitecommnewsno'] = 'No, I do not want to receive any email from Moodle HQ';
 +$string['sitecommnewsyes'] = 'Yes please, include me in Moodle’s regular e-newsletter updates';
  $string['sitecountry'] = 'Country';
 -$string['sitecountry_help'] = 'The country your organisation is in.';
 +$string['sitecountry_help'] = 'The country your organisation or institution is located in.';
  $string['sitedesc'] = 'Description';
 -$string['sitedesc_help'] = 'This description of your site may be shown in the site listing.  Please use plain text only.';
 +$string['sitedesc_help'] = 'Provide some information about how you are using Moodle.';
  $string['sitegeolocation'] = 'Geolocation';
  $string['sitegeolocation_help'] = 'In future we may provide location-based searching in the hubs. If you want to specify the location for your site use a latitude/longitude value here (eg: -31.947884,115.871285).  One way to find this is to use Google Maps.';
 -$string['siteemail'] = 'Email address';
 -$string['siteemail_help'] = 'You need to provide an email address so the hub administrator can contact you if necessary.  This will not be used for any other purpose. It is recommended to enter a email address related to a position (example: sitemanager@example.com) and not directly to a person.';
 +$string['siteemail'] = 'Admin email address';
 +$string['siteemail_help'] = 'An email address is necessary so that Moodle HQ can contact you if required.  It may also be used for other purposes as you allow below.    We recommend a generic email address related to a position (eg.: sitemanager@example.com), not a personal address.';
  $string['sitelang'] = 'Language';
 -$string['sitelang_help'] = 'Your site language will be displayed on the site listing.';
 +$string['sitelang_help'] = 'What is the main language used on your Moodle site?';
  $string['sitename'] = 'Name';
  $string['sitename_help'] = 'The name of the site will be shown on the site listing if the hub allows that.';
  $string['sitephone'] = 'Phone';

diff --cc lang/en/moodle.php
index 535dae0,0b4f584..5af498b
--- 1/lang/en/moodle.php
--- 2/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@@ -993,9 -992,7 +993,9 @@@ $string['choosereportfilter'] = 'Choos
  $string['choosetheme'] = 'Choose theme';
  $string['chooseuser'] = 'Choose a user';
  $string['courseduration'] = 'Course duration';
- $string['courseduration_desc'] = 'The course duration is used to calculate the default course end date. The course end date is only used for reports. Users can still enter the course after the end date.';
+ $string['courseduration_desc'] = 'The course duration is used to calculate the default course end date. The course end date is used for determining whether a course should be included in a user\'s list of courses.  It may also be used by custom reports. Users can still enter the course after the end date.';
 +$string['courseenddateenabled'] = 'Course end date enabled by default';
 +$string['courseenddateenabled_desc'] = 'This setting determines if the course end date will be enabled by default for new courses and set to the date calculated from the course duration.';
  $string['eventcontentviewed'] = 'Content viewed';
  $string['filter'] = 'Filter';
  $string['filteroption'] = '{$a->criteria}: {$a->value}';