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

Significant string changes:

* sitepolicies, core_admin - 'Site policies' changed to 'Site security
  settings'
* sitepolicy_help and sitepolicyguest_help, core_admin - setting will
  only have an effect if the site policy handler is set to default
* sitepolicyhandler_desc,core_admin - improved wording
* pathtodot_help, core_admin - Windows and Mac paths
* debugstringids_desc, core_admin - improved explanation

admin/tool/messageinbound/lang/en/tool_messageinbound.php

@@ -24,7 +24,7 @@
 
 $string['classname'] = 'Class name';
 $string['component'] = 'Component';
-$string['configmessageinboundhost'] = 'The address of the server that Moodle should check mail against. To specify a non-default port, you can use the [server]:[port], for example mail.example.com:587 format. If you leave this field blank, Moodle will use the default port for the type of mail server you specify.';
+$string['configmessageinboundhost'] = 'The address of the server that Moodle should check mail against. To specify a non-default port, use [server]:[port], for example mail.example.com:587. If a port isn\'t specified, the default port for the type of mail server will be used.';
 $string['defaultexpiration'] = 'Default address expiry period';
 $string['defaultexpiration_help'] = 'When an email address is generated by the handler, it can be set to automatically expire after a period of time, so that it can no longer be used. It is advisable to set an expiry period.';
 $string['description'] = 'Description';

admin/tool/monitor/lang/en/tool_monitor.php

@@ -97,9 +97,9 @@
 $string['privacy:metadata:timemodifiedrule'] = 'When this rule was last modified';
 $string['privacy:metadata:timesent'] = 'When the message was sent';
 $string['privacy:metadata:timewindow'] = 'Time window in seconds';
-$string['privacy:metadata:userid'] = 'Id of user who created the rule';
-$string['privacy:metadata:useridhistory'] = 'User to whom this notification was sent';
-$string['privacy:metadata:useridsub'] = 'User id of the subscriber';
+$string['privacy:metadata:userid'] = 'The ID of user who created the rule.';
+$string['privacy:metadata:useridhistory'] = 'The ID of the user to whom this notification was sent';
+$string['privacy:metadata:useridsub'] = 'The ID of the subscriber.';
 $string['privacy:subscriptions'] = 'My event monitor subscriptions';
 $string['processevents'] = 'Process events';
 $string['rulename'] = 'Rule name';

blocks/activity_modules/lang/en/block_activity_modules.php

@@ -24,4 +24,4 @@
 
 $string['activity_modules:addinstance'] = 'Add a new activities block';
 $string['pluginname'] = 'Activities';
-$string['privacy:metadata'] = 'The Activites block only shows data stored in other locations.';
+$string['privacy:metadata'] = 'The Activities block only shows data stored in other locations.';

blocks/activity_results/lang/en/block_activity_results.php

@@ -65,4 +65,4 @@
 $string['worstgrades'] = 'The {$a} lowest grades:';
 $string['worstgroupgrade'] = 'The group with the lowest average:';
 $string['worstgroupgrades'] = 'The {$a} groups with the lowest average:';
-$string['privacy:metadata'] = 'The Activites results block only shows data stored in other locations.';
+$string['privacy:metadata'] = 'The Activity results block only shows data stored in other locations.';

blocks/badges/lang/en/block_badges.php

@@ -28,4 +28,4 @@
 $string['nothingtodisplay'] = 'You have no badges to display';
 $string['badges:addinstance'] = 'Add a new My latest badges block';
 $string['badges:myaddinstance'] = 'Add a new My latest badges block to Dashboard';
-$string['privacy:metadata'] = 'The Badges block only shows data stored in other locations.';
+$string['privacy:metadata'] = 'The Latest badges block only shows data stored in other locations.';

blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php

@@ -25,4 +25,4 @@
 $string['calendar_upcoming:addinstance'] = 'Add a new upcoming events block';
 $string['calendar_upcoming:myaddinstance'] = 'Add a new upcoming events block to Dashboard';
 $string['pluginname'] = 'Upcoming events';
-$string['privacy:metadata'] = 'The Upcoming calendar events block only displays existing calendar data.';
+$string['privacy:metadata'] = 'The Upcoming events block only displays existing calendar data.';

blocks/course_summary/lang/en/block_course_summary.php

@@ -26,4 +26,4 @@
 $string['coursesummary'] = 'Course summary';
 $string['course_summary:addinstance'] = 'Add a new course/site summary block';
 $string['pluginname'] = 'Course/site summary';
-$string['privacy:metadata'] = 'The Course and site summaryblock only shows information about courses and does not store data itself.';
+$string['privacy:metadata'] = 'The Course/site summary block only shows information about courses and does not store data itself.';

blocks/login/lang/en/block_login.php

@@ -24,4 +24,4 @@
 
 $string['login:addinstance'] = 'Add a new login block';
 $string['pluginname'] = 'Login';
-$string['privacy:metadata'] = 'The Login block only provides a way to login and does not store any data itself.';
+$string['privacy:metadata'] = 'The Login block only provides a way to log in and does not store any data itself.';

blocks/myprofile/lang/en/block_myprofile.php

@@ -45,7 +45,7 @@
 $string['myprofile:myaddinstance'] = 'Add a new logged in user block to Dashboard';
 $string['myprofile_settings'] = 'Visible user information';
 $string['pluginname'] = 'Logged in user';
-$string['privacy:metadata'] = 'The Logged in users block only shows information about logged in users and does not store data itself.';
+$string['privacy:metadata'] = 'The Logged in user block only shows information about the logged in user and does not store data itself.';
 
 // Deprecated since Moodle 3.2.
 $string['display_un'] = 'Display name';

blocks/private_files/lang/en/block_private_files.php

@@ -26,4 +26,4 @@
 $string['privatefiles'] = 'Private files';
 $string['private_files:addinstance'] = 'Add a new private files block';
 $string['private_files:myaddinstance'] = 'Add a new private files block to Dashboard';
-$string['privacy:metadata'] = 'The Private files block only provides a view of, and link to, the user private files.';
+$string['privacy:metadata'] = 'The Private files block only provides a view of, and a link to, the user\'s private files.';

blocks/tag_youtube/lang/en/block_tag_youtube.php

@@ -47,4 +47,4 @@
 $string['sports'] = 'Sports';
 $string['tag_youtube:addinstance'] = 'Add a new YouTube block';
 $string['travel'] = 'Travel & Places';
-$string['privacy:metadata'] = 'The Youtube block only shows data stored in other locations.';
+$string['privacy:metadata'] = 'The YouTube block only shows data stored in other locations.';

calendar/type/gregorian/lang/en/calendartype_gregorian.php

@@ -24,4 +24,4 @@
 
 $string['name'] = 'Gregorian';
 $string['pluginname'] = 'Gregorian calendar type';
-$string['privacy:metadata'] = 'The Gregorian Calendar format plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Gregorian calendar format plugin does not store any personal data.';

enrol/paypal/lang/en/enrol_paypal.php

@@ -39,7 +39,7 @@
 $string['enrolperiod_help'] = 'Length of time that the enrolment is valid, starting with the moment the user is enrolled. If disabled, the enrolment duration will be unlimited.';
 $string['enrolstartdate'] = 'Start date';
 $string['enrolstartdate_help'] = 'If enabled, users can be enrolled from this date onward only.';
-$string['errdisabled'] = 'PayPal plugin is disabled and does not handle payment notifications.';
+$string['errdisabled'] = 'The PayPal enrolment plugin is disabled and does not handle payment notifications.';
 $string['erripninvalid'] = 'Instant payment notification has not been verified by PayPal.';
 $string['errpaypalconnect'] = 'Could not connect to {$a->url} to verify the instant payment notification: {$a->result}';
 $string['expiredaction'] = 'Enrolment expiry action';

lang/en/admin.php

@@ -425,7 +425,7 @@
 $string['debugpageinfo'] = 'Show page information';
 $string['debugsmtp'] = 'Debug email sending';
 $string['debugstringids'] = 'Show origin of languages strings';
-$string['debugstringids_desc'] = 'This option is designed to help translators. When this option is enabled, if you add the parameter strings=1 to a request URL, it will show the language file and string id beside each string that is output.';
+$string['debugstringids_desc'] = 'If enabled, language string components and identifiers are displayed when ?strings=1 or &strings=1 is appended to the page URL.';
 $string['debugvalidators'] = 'Show validator links';
 $string['defaultcity'] = 'Default city';
 $string['defaultcity_help'] = 'A city entered here will be the default city when creating new user accounts.';
@@ -825,7 +825,7 @@
 $string['passwordreuselimit'] = 'Password rotation limit';
 $string['passwordreuselimit_desc'] = 'Number of times a user must change their password before they are allowed to reuse a password. Hashes of previously used passwords are stored in local database table. This feature might not be compatible with some external authentication plugins.';
 $string['pathtodot'] = 'Path to dot';
-$string['pathtodot_help'] = 'Path to dot. Probably something like /usr/bin/dot. To be able to generate graphics from DOT files, you must have installed the dot executable and point to it here. Note that, for now, this only used by the profiling features (Development->Profiling) built into Moodle.';
+$string['pathtodot_help'] = 'Path to dot. On Linux it is something like /usr/bin/dot. On Windows it is something like C:\Program Files (x86)\Graphviz2.38\bin\dot.exe. On Mac it is something like /opt/local/bin/dot. To be able to generate graphics from DOT files, you must have installed the dot executable and point to it here.';
 $string['pathtodu'] = 'Path to du';
 $string['pathtogs'] = 'Path to ghostscript';
 $string['pathtogs_help'] = 'On most Linux installs, this can be left as \'/usr/bin/gs\'. On Windows it will be something like \'c:\\gs\\bin\\gswin32c.exe\' (make sure there are no spaces in the path - if necessary copy the files \'gswin32c.exe\' and \'gsdll32.dll\' to a new folder without a space in the path)';
@@ -1032,15 +1032,15 @@
 $string['sitemaintenanceoncli'] = 'Your site is currently in CLI maintenance mode, no web access is allowed.';
 $string['sitemaintenancewarning'] = 'Your site is currently in maintenance mode (only admins can log in).  To return this site to normal operation, <a href="maintenance.php">disable maintenance mode</a>.';
 $string['sitemaintenancewarning2'] = 'Your site is currently in maintenance mode (only admins can log in).  To return this site to normal operation, <a href="{$a}">disable maintenance mode</a>.';
-$string['sitepolicies'] = 'Site policies';
+$string['sitepolicies'] = 'Site security settings';
 $string['sitepolicy'] = 'Site policy URL';
-$string['sitepolicy_help'] = 'If you have a site policy that all registered users must see and agree to before using this site, then specify the URL to it here, otherwise leave this field blank. This setting can contain any public URL.';
+$string['sitepolicy_help'] = 'The URL of the site policy that all registered users must see and agree to before accessing the site. Note that this setting will only have an effect if the site policy handler is set to default (core).';
 $string['sitepolicyhandler'] = 'Site policy handler';
-$string['sitepolicyhandler_desc'] = 'Select the component to handle user agreements to site policies. The default core handler provides a simple functionality controlled by the two other settings `sitepolicy` and `sitepolicyguest`. Alternative handlers may be provided by additional plugins and offer more advanced control of site policies.';
+$string['sitepolicyhandler_desc'] = 'This determines how policies and user consents are managed. The default (core) handler enables a site policy URL and a site policy URL for guests to be specified. Alternative handlers may be provided by additional plugins and offer more advanced control of site policies.';
 $string['sitepolicyhandlercore'] = 'Default (core)';
 $string['sitepolicyhandlerplugin'] = '{$a->name} ({$a->component})';
 $string['sitepolicyguest'] = 'Site policy URL for guests';
-$string['sitepolicyguest_help'] = 'If you have a site policy that all guests must see and agree to before using this site, then specify the URL to it here, otherwise leave this field blank. This setting can contain any public URL. Note: access of not-logged-in users may be prevented with forcelogin setting.';
+$string['sitepolicyguest_help'] = 'The URL of the site policy that all guests must see and agree to before accessing the site. Note that this setting will only have an effect if the site policy handler is set to default (core).';
 $string['sitesectionhelp'] = 'If selected, a topic section will be displayed on the site\'s front page.';
 $string['slasharguments'] = 'Use slash arguments';
 $string['slashargumentswarning'] = 'It is recommended that the use of slash arguments is enabled. In future it will be required. For more details, see the documentation <a href="https://docs.moodle.org/en/admin/environment/slasharguments">Using slash arguments</a>.';

lang/en/blog.php

@@ -133,22 +133,22 @@
 $string['privacy:metadata:core_files'] = 'Files attached to blog entries';
 $string['privacy:metadata:core_tag'] = 'Tags associated with blog entries';
 $string['privacy:metadata:external'] = 'A link to an external RSS feed';
-$string['privacy:metadata:external:userid'] = 'The user ID';
+$string['privacy:metadata:external:userid'] = 'The ID of the user who added the external blog entry.';
 $string['privacy:metadata:external:name'] = 'The name of the feed';
 $string['privacy:metadata:external:description'] = 'The description of the feed';
 $string['privacy:metadata:external:url'] = 'The URL of the feed';
 $string['privacy:metadata:external:filtertags'] = 'The list of tags to filter the entries with';
 $string['privacy:metadata:external:timemodified'] = 'Date at which the association was last modified';
 $string['privacy:metadata:external:timefetched'] = 'Date at which the feed was last fetched';
 $string['privacy:metadata:post'] = 'The information related to blog entries';
-$string['privacy:metadata:post:userid'] = 'The user ID';
-$string['privacy:metadata:post:subject'] = 'The subject of the entry';
-$string['privacy:metadata:post:summary'] = 'The summary of the entry';
-$string['privacy:metadata:post:content'] = 'The content of an external entry';
+$string['privacy:metadata:post:userid'] = 'The ID of the user who added the blog entry.';
+$string['privacy:metadata:post:subject'] = 'Blog entry title.';
+$string['privacy:metadata:post:summary'] = 'Blog entry.';
+$string['privacy:metadata:post:content'] = 'The content of an external blog entry.';
 $string['privacy:metadata:post:uniquehash'] = 'A unique identifier for an external entry, typically a URL.';
 $string['privacy:metadata:post:publishstate'] = 'Whether the entry is visible to others or not';
-$string['privacy:metadata:post:created'] = 'Date at which the entry was created';
-$string['privacy:metadata:post:lastmodified'] = 'Date at which the entry was last modified';
+$string['privacy:metadata:post:created'] = 'Date when the entry was created.';
+$string['privacy:metadata:post:lastmodified'] = 'Date when the entry was last modified.';
 $string['privacy:metadata:post:usermodified'] = 'The user who last modified the entry';
 $string['privacy:path:blogassociations'] = 'Associated blog posts';
 $string['privacy:unknown'] = 'Unknown';

lang/en/editor.php

@@ -117,7 +117,7 @@
 $string['popupeditor'] = 'Enlarge Editor';
 $string['preformatted'] = 'Preformatted';
 $string['preview'] = 'Preview';
-$string['privacy:metadata:preference:htmleditor'] = 'The preferred editor to use when using an HTML Text Area';
+$string['privacy:metadata:preference:htmleditor'] = 'Text editor preference.';
 $string['privacy:preference:htmleditor'] = 'Your preferred editor to use for writing HTML text is {$a}';
 $string['properties'] = 'Properties';
 $string['redo'] = 'Redo your last action';

lang/en/moodle.php

@@ -1385,7 +1385,7 @@
 $string['notifyloginfailuresmessagestart'] = 'Here is a list of failed login attempts at {$a} since you were last notified';
 $string['notifyloginfailuressubject'] = '{$a} :: Failed logins notification';
 $string['notincluded'] = 'Not included';
-$string['notingroup'] = 'Sorry, but you need to be part of a group to see this activity.';
+$string['notingroup'] = 'Sorry, but you need to be part of a group to see this page.';
 $string['notpublic'] = 'Not public!';
 $string['nousersfound'] = 'No users found';
 $string['nousersmatching'] = 'No users matching \'{$a}\' were found';

lang/en/rss.php

@@ -24,6 +24,5 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-
 $string['privacy:metadata:core_userkey'] = 'User\'s keys used to access RSS from a URL';
 $string['rss'] = 'RSS';

lang/en/tag.php

@@ -97,8 +97,8 @@
 $string['privacy:metadata:tag:rawname'] = 'The name of the tag - this is the display name.';
 $string['privacy:metadata:tag:description'] = 'The description of the tag.';
 $string['privacy:metadata:tag:flag'] = 'Whether a tag has been flagged as inappropriate.';
-$string['privacy:metadata:tag:timemodified'] = 'The last time that the tag was last modified.';
-$string['privacy:metadata:tag:userid'] = 'The user who first created the tag.';
+$string['privacy:metadata:tag:timemodified'] = 'The time that the tag was last modified.';
+$string['privacy:metadata:tag:userid'] = 'The ID of the user who created the tag.';
 $string['privacy:metadata:taginstance'] = 'The link between each tag and where it is used.';
 $string['privacy:metadata:taginstance:tagid'] = 'The link to the tag.';
 $string['privacy:metadata:taginstance:ordering'] = 'The relative order of this tag.';

lib/antivirus/clamav/lang/en/antivirus_clamav.php

@@ -36,7 +36,7 @@
 $string['pathtounixsocket'] = 'Unix domain socket';
 $string['pathtounixsocketdesc'] = 'If the running method is set to "Unix domain socket", enter the path to ClamAV Unix socket here. On Debian Linux this will be /var/run/clamav/clamd.ctl. Please make sure that clamav daemon has read access to uploaded files, the easiest way to ensure that is to add \'clamav\' user to your webserver group (\'www-data\' on Debian Linux).';
 $string['pluginname'] = 'ClamAV antivirus';
-$string['privacy:metadata'] = 'The ClazmAV Antivirus plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The ClamAV antivirus plugin does not store any personal data.';
 $string['quarantinedir'] = 'Quarantine directory';
 $string['runningmethod'] = 'Running method';
 $string['runningmethoddesc'] = 'Method of running ClamAV. Command line is used by default, however on Unix systems better performance can be obtained by using system sockets.';

lib/editor/atto/lang/en/editor_atto.php

@@ -47,7 +47,7 @@
 $string['infostatus'] = 'Information';
 $string['warningstatus'] = 'Warning';
 $string['autosaves'] = 'Editor autosave information';
-$string['privacy:metadata:database:atto_autosave'] = 'Editor drafts which was automatically saved.';
-$string['privacy:metadata:database:atto_autosave:userid'] = 'The ID of the user who\'s data was saved.';
+$string['privacy:metadata:database:atto_autosave'] = 'Automatically saved text editor drafts.';
+$string['privacy:metadata:database:atto_autosave:userid'] = 'The ID of the user whose data was saved.';
 $string['privacy:metadata:database:atto_autosave:drafttext'] = 'The text which was saved.';
 $string['privacy:metadata:database:atto_autosave:timemodified'] = 'The time that content was modified.';

lib/editor/tinymce/plugins/pdw/lang/en/tinymce_pdw.php

@@ -26,4 +26,4 @@
 
 /* All lang strings used from TinyMCE JavaScript code must be named 'pluginname:stringname', no need to create langs/en_dlg.js */
 $string['pdw:desc'] = 'Toolbar Toggle';
-$string['privacy:metadata'] = 'The TinyMCE Toolebar toggle plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The TinyMCE Toolbar toggle plugin does not store any personal data.';