MDL-60449 lang: Merge English strings from the en_fix language pack

Significant string changes:

* multiple strings in core_hub - 'Publish' changed to 'Share' plus other
  wording improvements to avoid misunderstandings
* errorretrievingkey in message_airnotifier - improved wording and
  removing reference to Moodle.org
* enddate_help and courseduration_desc in core - clearer wording
  explaining what the date actually does
* restore:viewautomatedfilearea in core_role - changing wording to match
  the behaviour
* dropzones_help in qtype_ddmarker - improved wording
* autologinkeygenerationlockout in tool_mobile - updated error message
* configallowemailaddresses in core_admin - clearer description
* subscriptionmode_helpin mod_forum - removing misleading sentence about
  subscription mode changes not affecting existing users

admin/tool/analytics/lang/en/tool_analytics.php

@@ -25,14 +25,14 @@
 $string['accuracy'] = 'Accuracy';
 $string['allpredictions'] = 'All predictions';
 $string['analysingsitedata'] = 'Analysing the site';
-$string['analyticmodels'] = 'Analytic models';
+$string['analyticmodels'] = 'Analytics models';
 $string['bettercli'] = 'Evaluating models and generating predictions may involve heavy processing. It is recommended to run these actions from the command line.';
 $string['cantguessstartdate'] = 'Can\'t guess the start date';
 $string['cantguessenddate'] = 'Can\'t guess the end date';
 $string['clearpredictions'] = 'Clear predictions';
 $string['clearmodelpredictions'] = 'Are you sure you want to clear all "{$a}" predictions?';
 $string['clienablemodel'] = 'You can enable the model by selecting a time-splitting method by its ID. Note that you can also enable it later using the web interface (\'none\' to exit).';
-$string['clievaluationandpredictions'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. You can allow these processes to be executed manually via the web interface by disabling the <a href="{$a}">\'onlycli\'</a> analytics setting';
+$string['clievaluationandpredictions'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. You can allow these processes to be executed manually via the web interface by disabling the <a href="{$a}">\'onlycli\'</a> analytics setting.';
 $string['editmodel'] = 'Edit "{$a}" model';
 $string['edittrainedwarning'] = 'This model has already been trained. Note that changing its indicators or its time-splitting method will delete its previous predictions and start generating new predictions.';
 $string['enabled'] = 'Enabled';

admin/tool/httpsreplace/lang/en/tool_httpsreplace.php

@@ -22,20 +22,22 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['complete'] = 'Completed.';
-$string['count'] = 'Number of embeded content items';
+$string['complete'] = 'Completed';
+$string['count'] = 'Number of embedded content items';
 $string['disclaimer'] = 'I understand the risks of this operation';
-$string['doclink'] = 'Read more documentation on the wiki';
-$string['doit'] = 'Perform replacement';
+$string['doclink'] = 'HTTPS conversion tool';
+$string['doit'] = 'Perform conversion';
 $string['domain'] = 'Problematic domain';
-$string['domainexplain'] = 'When an instance is moved from HTTP to HTTPS, all embeded HTTP content will stop working. This tool allows you to automatically convert the HTTP content to HTTPS. Below you can run a report of content that may not work once you run this script. You may want to check each one has HTTPS available or find alternative resources.';
-$string['domainexplainhelp'] = 'These domains are found in your content, but do not appear to support HTTPS content. After switching to HTTPS, the content included from these sites will no longer display within Moodle for users with secure modern browsers. It is possible that these sites are temporarily or permanently unavailable and will not work with either security setting. Proceed only after reviewing these results and determining if this externally hosted content is non-essential. Note: This content would no longer work upon switching to HTTPS anyway.';
+$string['domainexplain'] = 'When a site is moved from HTTP to HTTPS, all embeded HTTP content will stop working. This tool allows you to automatically convert HTTP content to HTTPS.
+
+Before performing the conversion, content will be scanned to find any URLs which may not work after conversion. You may want to check each one has HTTPS available, or find alternative resources.';
+$string['domainexplainhelp'] = 'These domains are found in your content, but do not appear to support HTTPS content. After switching to HTTPS, the content included from these sites will no longer display within Moodle for users with secure modern browsers. It is possible that these sites are temporarily or permanently unavailable and will not work with either security setting. Proceed only after reviewing these results and determining if this externally-hosted content is non-essential. Note: This content would no longer work upon switching to HTTPS anyway.';
 $string['httpwarning'] = 'This instance is still running on HTTP. You can still run this tool and external content will be changed to HTTPS, but internal content will remain on HTTP. You will need to run this script again after switching to HTTPS to convert internal content.';
 $string['notimplemented'] = 'Sorry, this feature is not implemented in your database driver.';
 $string['oktoprocede'] = 'The scan finds no issues with your content. You can proceed to upgrade any HTTP content to use HTTPS.';
-$string['pageheader'] = 'Upgrade externally hosted content urls to HTTPS';
+$string['pageheader'] = 'Upgrade externally-hosted content URLs to HTTPS';
 $string['pluginname'] = 'HTTPS conversion tool';
 $string['replacing'] = 'Replacing HTTP content with HTTPS...';
 $string['searching'] = 'Searching {$a}';
-$string['takeabackupwarning'] = 'Once this is tool run, changes made can\'t be reverted. A complete backup should be made before running this script. There is a low risk that the wrong content will be replaced, introducing problems.';
-$string['toolintro'] = 'If you are planning on converting your site to HTTPS, you can use the <a href="{$a}">HTTPS conversion tool</a> to convert your embeded content to HTTPS.';
+$string['takeabackupwarning'] = 'Warning: After running this tool, changes cannot be reverted. It is recommended that a site backup is made before proceeding, as there is a small risk of wrong content being replaced.';
+$string['toolintro'] = 'If you are planning on converting your site to HTTPS, you can use the <a href="{$a}">HTTPS conversion tool</a> to convert your embedded content to HTTPS.';

admin/tool/mobile/lang/en/tool_mobile.php

@@ -25,7 +25,7 @@
 $string['adodbdebugwarning'] = 'ADOdb debugging is enabled. It should be disabled in the external database authentication or external database enrolment plugin settings.';
 $string['androidappid'] = 'Android app\'s unique identifier';
 $string['androidappid_desc'] = 'This setting may be left as default unless you have a custom Android app.';
-$string['autologinkeygenerationlockout'] = 'Auto-login key generation is blocked because of too many requests within an hour.';
+$string['autologinkeygenerationlockout'] = 'Auto-login key generation is blocked. You need to wait 6 minutes between requests.';
 $string['autologinnotallowedtoadmins'] = 'Auto-login is not allowed for site admins.';
 $string['cachedef_plugininfo'] = 'This stores the list of plugins with mobile addons';
 $string['clickheretolaunchtheapp'] = 'Click here if the app does not open automatically.';

lang/en/admin.php

@@ -142,7 +142,7 @@ $string['configallowblockstodock'] = 'If enabled and supported by the selected t
 $string['configallowcategorythemes'] = 'If you enable this, then themes can be set at the category level. This will affect all child categories and courses unless they have specifically set their own theme. WARNING: Enabling category themes may affect performance.';
 $string['configallowcoursethemes'] = 'If you enable this, then courses will be allowed to set their own themes.  Course themes override all other theme choices (site, user, or session themes)';
 $string['configallowedemaildomains'] = 'List email domains that are allowed to be disclosed in the "From" section of outgoing email. The default of "Empty" will use the No-reply address for all outgoing email. The use of wildcards is allowed e.g. *.example.com will allow emails sent from any subdomain of example.com, but not example.com itself. This will require separate entry.';
-$string['configallowemailaddresses'] = 'If you want to restrict all new email addresses to particular domains, then list them here separated by spaces.  All other domains will be rejected.  To allow subdomains add the domain with a preceding \'.\'. eg <strong>ourcollege.edu.au .gov.au</strong>';
+$string['configallowemailaddresses'] = 'To restrict new email addresses to particular domains, list them here separated by spaces. All other domains will be rejected. To allow subdomains, add the domain with a preceding \'.\'. To allow a root domain together with its subdomains, add the domain twice - once with a preceding \'.\' and once without e.g. .ourcollege.edu.au ourcollege.edu.au.';
 $string['configallowguestmymoodle'] = 'If enabled guests can access Dashboard, otherwise guests are redirected to the site front page.';
 $string['configallowobjectembed'] = 'As a default security measure, normal users are not allowed to embed multimedia (like Flash) within texts using explicit EMBED and OBJECT tags in their HTML (although it can still be done safely using the mediaplugins filter).  If you wish to allow these tags then enable this option.';
 $string['configallowoverride'] = 'You can allow people with the roles on the left side to override some of the column roles';

lang/en/analytics.php

@@ -55,7 +55,7 @@ $string['errorunexistingmodel'] = 'Non-existing model {$a}';
 $string['errorunknownaction'] = 'Unknown action';
 $string['eventpredictionactionstarted'] = 'Prediction process started';
 $string['eventinsightsviewed'] = 'Insights viewed';
-$string['fixedack'] = 'Acknowledged / fixed';
+$string['fixedack'] = 'Acknowledged';
 $string['insightmessagesubject'] = 'New insight for "{$a->contextname}": {$a->insightname}';
 $string['insightinfomessage'] = 'The system generated some insights for you: {$a}';
 $string['insightinfomessagehtml'] = 'The system generated some insights for you: <a href="{$a}">{$a}</a>.';

lang/en/hub.php

@@ -24,11 +24,11 @@
  */
 
 $string['addscreenshots'] = 'Add screenshots';
-$string['advertise'] = 'Advertise this course for people to join';
+$string['advertise'] = 'Share this course for people to join';
 $string['advertised'] = 'Advertised';
-$string['advertiseon'] = 'Advertise this course on {$a}';
+$string['advertiseon'] = 'Share this course on {$a}';
 $string['readvertiseon'] = 'Update advertising information on {$a}';
-$string['advertisepublication_help'] = 'Advertising your course on a community server allows people to find this course and come here to enrol.';
+$string['advertisepublication_help'] = 'This course will be listed on Moodle.net as a course that people can enrol in and participate. Email-based self-registration should be enabled on the site and you need to enable self enrolment in this course.';
 $string['audience'] = 'Audience';
 $string['audience_help'] = 'Select the intended audience for the course.';
 $string['audienceeducators'] = 'Educators';
@@ -40,11 +40,11 @@ $string['confirmregistration'] = 'Confirm registration';
 $string['contributornames'] = 'Other contributors';
 $string['contributornames_help'] = 'You can use this field to list the names of anyone else who contributed to this course.';
 $string['coursename'] = 'Name';
-$string['coursepublished'] = 'This course has been published successfully on \'{$a}\'.';
+$string['coursepublished'] = 'This course has been shared successfully on \'{$a}\'.';
 $string['courseshortname'] = 'Shortname';
 $string['courseshortname_help'] = 'Enter a short name for your course. It does not need to be unique.';
 $string['coursesnumber'] = 'Number of courses ({$a})';
-$string['courseunpublished'] = 'The course {$a->courseshortname} is no longer published on {$a->hubname}.';
+$string['courseunpublished'] = 'The course {$a->courseshortname} is no longer shared on {$a->hubname}.';
 $string['courseurl'] = 'Course URL';
 $string['courseurl_help'] = 'It is the URL of your course. This URL is displayed as a link in a search result.';
 $string['creatorname'] = 'Creator';
@@ -107,7 +107,7 @@ $string['nocheckstatusfromunreghub'] = 'The site is not registered on the hub so
 $string['nohubselected'] = 'No hub selected';
 $string['none'] = 'None';
 $string['nosearch'] = 'Don\'t publish hub or courses';
-$string['notregisteredonhub'] = 'Your administrator needs to register this site with Moodle.net before you can publish a course.';
+$string['notregisteredonhub'] = 'Your administrator needs to register this site with Moodle.net before you can share a course.';
 $string['operation'] = 'Actions';
 $string['participantnumberaverage'] = 'Average number of participants ({$a})';
 $string['postaladdress'] = 'Postal address';
@@ -117,8 +117,8 @@ $string['previousregistrationdeleted'] = 'The previous registration has been del
 $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['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.';
@@ -149,7 +149,7 @@ $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['sitecountry'] = 'Country';
@@ -189,11 +189,11 @@ $string['statusunpublished'] = 'Not listed';
 $string['tags'] = 'Tags';
 $string['tags_help'] = 'Tags help to further categorise your course and help it to be found. Please use simple, meaningful words and separate them with a comma. Example: math, algebra, geometry';
 $string['type'] = 'Advertised / Shared';
-$string['unpublish'] = 'Unpublish';
+$string['unpublish'] = 'Stop sharing';
 $string['unpublishalladvertisedcourses'] = 'Remove all courses currently being advertised on Moodle.net';
 $string['unpublishalluploadedcourses'] = 'Removed all courses that were uploaded to Moodle.net';
 $string['unpublishconfirmation'] = 'Do you really want to remove the course "{$a->courseshortname}" from "{$a->hubname}"';
-$string['unpublishcourse'] = 'Unpublish {$a}';
+$string['unpublishcourse'] = 'Stop sharing {$a}';
 $string['unregister'] = 'Unregister';
 $string['unregisterfrom'] = 'Unregister from {$a}';
 $string['unregistrationerror'] = 'An error occurred when the site tried to unregister from Moodle.net: {$a}';
@@ -207,7 +207,7 @@ $string['wrongtoken'] = 'The registration failed for some unknown reason (networ
 // Deprecated since Moodle 3.4.
 $string['registermoochtips'] = 'Register your site with Moodle to get security alerts and access to Moodle.net, our course sharing platform.';
 $string['errorcronnoxmlrpc'] = 'XML-RPC must be enabled in order to update the registration.';
-$string['advertiseonhub'] = 'Advertise this course on a hub';
+$string['advertiseonhub'] = 'Share this course for people to join';
 $string['advertiseonmoodleorg'] = 'Advertise this course on moodle.org';
 $string['all'] = 'All';
 $string['allowglobalsearch'] = 'Publish this hub and allow global search of all courses';
@@ -243,7 +243,7 @@ $string['prioritise'] = 'Prioritise';
 $string['private'] = 'Private';
 $string['privatehuburl'] = 'Private hub URL';
 $string['publichub'] = 'Public hub';
-$string['publishon'] = 'Publish on';
+$string['publishon'] = 'Share on';
 $string['publishonspecifichub'] = 'Publish on another Hub';
 $string['registeredmoodleorg'] = 'Moodle ({$a})';
 $string['registeredon'] = 'Where your site is registered';
@@ -251,7 +251,7 @@ $string['registerwith'] = 'Register with a hub';
 $string['registrationupdated'] = 'Registration has been updated.';
 $string['registrationupdatedfailed'] = 'Registration update failed.';
 $string['selecthub'] = 'Select hub';
-$string['selecthubinfo'] = 'A community hub is a server that lists courses. You can only publish your courses on hubs that this Moodle site is registered with.  If the hub you want is not listed below, please contact your site administrator.';
+$string['selecthubinfo'] = 'A community hub is a server that lists courses. You can only share your courses on hubs that this Moodle site is registered with.  If the hub you want is not listed below, please contact your site administrator.';
 $string['selecthubforadvertise'] = 'Select hub for advertising';
 $string['selecthubforsharing'] = 'Select hub for uploading';
 $string['settings'] = 'Settings';
@@ -275,5 +275,5 @@ $string['url'] = 'hub URL';
 $string['warning'] = 'WARNING';
 $string['wrongurlformat'] = 'Bad URL format';
 $string['xmlrpcdisabledcommunity'] = 'The XML-RPC extension is not enabled on the server. You can not search and download courses.';
-$string['xmlrpcdisabledpublish'] = 'The XML-RPC extension is not enabled on the server. You can not publish courses or manage published courses.';
+$string['xmlrpcdisabledpublish'] = 'The XML-RPC extension is not enabled on the server, so it is not possible to share courses or manage shared courses.';
 $string['xmlrpcdisabledregistration'] = 'The XML-RPC extension is not enabled on the server. You will not be able to unregister or update your registration until you enable it.';

lang/en/mnet.php

@@ -59,7 +59,7 @@ $string['duplicate_usernames'] = 'We failed to create an index on the columns "m
 $string['enabled_for_all'] = '(This service has been enabled for all hosts).';
 $string['enterausername'] = 'Please enter a username, or a list of usernames separated by commas.';
 $string['error7020'] = 'This error normally occurs if the remote site has created a record for you with the wrong wwwroot, for example, http://yoursite.com instead of http://www.yoursite.com. You should contact the administrator of the remote site with your wwwroot (as specified in config.php) asking her to update her record for your host.';
-$string['error7022'] = 'The message you sent to the remote site was encrypted properly, but not signed. This is very unexpected; you should probably file a bug if this occurs (giving as much information as possible about the application versions in question, etc.';
+$string['error7022'] = 'The message you sent to the remote site was encrypted properly, but not signed. This is very unexpected; you should probably file a bug if this occurs (giving as much information as possible about the application versions in question etc).';
 $string['error7023'] = 'The remote site has tried to decrypt your message with all the keys it has on record for your site. They have all failed. You might be able to fix this problem by manually re-keying with the remote site. This is unlikely to occur unless you\'ve been out of communication with the remote site for a few months.';
 $string['error7024'] = 'You send an unencrypted message to the remote site, but the remote site doesn\'t accept unencrypted communication from your site. This is very unexpected; you should probably file a bug if this occurs (giving as much information as possible about the application versions in question, etc.';
 $string['error7026'] = 'The key that your message was signed with differs from the key that the remote host has on file for your server. Further, the remote host attempted to fetch your current key and failed to do so. Please manually re-key with the remote host and try again.';

lang/en/moodle.php

@@ -714,7 +714,7 @@ $string['emptydragdropregion'] = 'empty region';
 $string['enable'] = 'Enable';
 $string['encryptedcode'] = 'Encrypted code';
 $string['enddate'] = 'Course end date';
-$string['enddate_help'] = 'The course end date is only used for reports. Users can still enter the course after the end date.';
+$string['enddate_help'] = 'The course end date is used for determining whether a course should be included in a user\'s list of courses. When the end date is past, the course is no longer listed in the navigation and is listed as past in the course overview. The course end date may also be used by custom reports. Users can still enter the course after the end date; in other words the date does not restrict access.';
 $string['english'] = 'English';
 $string['enrolmentmethods'] = 'Enrolment methods';
 $string['entercourse'] = 'Click to enter this course';
@@ -992,7 +992,7 @@ $string['choosereportfilter'] = 'Choose a filter for the report';
 $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['eventcontentviewed'] = 'Content viewed';
 $string['filter'] = 'Filter';
 $string['filteroption'] = '{$a->criteria}: {$a->value}';

message/output/airnotifier/lang/en/message_airnotifier.php

@@ -35,7 +35,7 @@ $string['configairnotifiermobileappname'] = 'The Mobile app unique identifier (u
 $string['deletecheckdevicename'] = 'Delete your device: {$a->name}';
 $string['deletedevice'] = 'Delete the device. Note that an app can register the device again. If the device keeps reappearing, disable it.';
 $string['devicetoken'] = 'Device token';
-$string['errorretrievingkey'] = 'An error occurred while retrieving key. Your Moodle site must be registered with Moodle.org to use this service. You may need to re-register to update your details there.';
+$string['errorretrievingkey'] = 'An error occurred while retrieving the access key. Your site must be registered to use this service. If your site is already registered, please try updating your registration.';
 $string['keyretrievedsuccessfully'] = 'Key retrieved successfully';
 $string['nodevices'] = 'No registered devices. Devices will automatically appear after you install the Moodle Mobile app and add this site.';
 $string['nopermissiontomanagedevices'] = 'You don\'t have permission to manage devices.';

mod/forum/lang/en/forum.php

@@ -505,9 +505,7 @@ $string['subscriptionmode_help'] = 'When a participant is subscribed to a forum
 * Optional subscription - Participants can choose whether to be subscribed
 * Forced subscription - Everyone is subscribed and cannot unsubscribe
 * Auto subscription - Everyone is subscribed initially but can choose to unsubscribe at any time
-* Subscription disabled - Subscriptions are not allowed
-
-Note: Any subscription mode changes will only affect users who enrol in the course in the future, and not existing users.';
+* Subscription disabled - Subscriptions are not allowed';
 $string['subscriptionoptional'] = 'Optional subscription';
 $string['subscriptionforced'] = 'Forced subscription';
 $string['subscriptionauto'] = 'Auto subscription';

mod/imscp/lang/en/imscp.php

@@ -31,7 +31,7 @@ $string['keepoldexplain'] = 'How many packages should be archived?';
 $string['indicator:cognitivedepth'] = 'IMS pkg cognitive';
 $string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in an IMS content package resource.';
 $string['indicator:socialbreadth'] = 'IMS pkg social';
-$string['indicator:socialbreadth_help'] = 'This indicator is based on the social depth reached by the student in an IMS content package resource.';
+$string['indicator:socialbreadth_help'] = 'This indicator is based on the social breadth reached by the student in an IMS content package resource.';
 $string['imscp:addinstance'] = 'Add a new IMS content package';
 $string['imscp:view'] = 'View IMS content';
 $string['modulename'] = 'IMS content package';

question/type/ddmarker/lang/en/qtype_ddmarker.php

@@ -40,7 +40,7 @@ $string['dropzones_help'] = 'The drop zones are defined by typing coordinates. A
 
 * Circle: centre_x, centre_y; radius<br>for example: <code>80, 100; 50</code>
 * Polygon: x1, y1; x2, y2; ...; xn, yn<br>for example: <code>20, 60; 100, 60; 20, 100</code>
-* Rectangle: left, top, width, height<br>for example: <code>20, 60; 80, 40</code>';
+* Rectangle: top_left_x, top_left_y; width, height<br>for example: <code>20, 60; 80, 40</code>';
 $string['followingarewrong'] = 'The following markers have been placed in the wrong area : {$a}.';
 $string['followingarewrongandhighlighted'] = 'The following markers were incorrectly placed :  {$a}. Highlighted marker(s) are now shown with the correct placement(s).<br /> Click on the marker to highlight the allowed area.';
 $string['formerror_nobgimage'] = 'You need to select an image to use as the background for the drag and drop area.';

report/insights/lang/en/report_insights.php

@@ -31,7 +31,7 @@ $string['insights'] = 'Insights';
 $string['outcome'] = 'Outcome';
 $string['outcomenegative'] = 'Negative outcome';
 $string['outcomeneutral'] = 'Neutral outcome';
-$string['outcomeok'] = 'Ok outcome';
+$string['outcomeok'] = 'OK outcome';
 $string['outcomepositive'] = 'Positive outcome';
 $string['outcomeverypositive'] = 'Very positive outcome';
 $string['outcomeverynegative'] = 'Very negative outcome';