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

admin/tool/dataprivacy/lang/en/tool_dataprivacy.php

@@ -33,7 +33,7 @@
 $string['approve'] = 'Approve';
 $string['approverequest'] = 'Approve request';
 $string['automaticdeletionrequests'] = 'Create automatic data deletion requests';
-$string['automaticdeletionrequests_desc'] = 'If enabled, automatic delete data request will be created upon user deletion or for each existing deleted user which data was not fully deleted.';
+$string['automaticdeletionrequests_desc'] = 'If enabled, a data deletion request will be created automatically for any user accounts deleted manually.';
 $string['bulkapproverequests'] = 'Approve requests';
 $string['bulkdenyrequests'] = 'Deny requests';
 $string['cachedef_purpose'] = 'Data purposes';

lang/en/grades.php

@@ -631,7 +631,7 @@
 $string['privacy:metadata:grades:aggregationweight'] = 'The weight in aggregation';
 $string['privacy:metadata:grades:feedback'] = 'The feedback';
 $string['privacy:metadata:grades:finalgrade'] = 'The grade';
-$string['privacy:metadata:grades:information'] = 'Some information additional information';
+$string['privacy:metadata:grades:information'] = 'Additional information about the grade';
 $string['privacy:metadata:grades:timemodified'] = 'The time when the grade was last modified';
 $string['privacy:metadata:grades:userid'] = 'The ID of the user whose grade it is';
 $string['privacy:metadata:grades:usermodified'] = 'The ID of the user who last modified the record';

lang/en/message.php

@@ -94,7 +94,7 @@
 $string['on'] = 'On';
 $string['online'] = 'Online';
 $string['outputdisabled'] = 'Output disabled';
-$string['outputdoesnotexist'] = 'Message output does not exists';
+$string['outputdoesnotexist'] = 'Message output does not exist';
 $string['outputenabled'] = 'Output enabled';
 $string['outputnotavailable'] = 'Not available';
 $string['outputnotconfigured'] = 'Not configured';

lang/en/mnet.php

@@ -182,7 +182,7 @@
 $string['publickey_help'] = 'The public key is automatically obtained from the remote server.';
 $string['publickeyrequired'] = 'You must provide a public key.';
 $string['publish'] = 'Publish';
-$string['reallydeleteserver'] = 'Are you sure you want to delete the server';
+$string['reallydeleteserver'] = 'Are you sure you want to delete the server?';
 $string['receivedwarnings'] = 'The following warnings were received';
 $string['recordnoexists'] = 'Record does not exist.';
 $string['reenableserver'] = 'No - select this option to re-enable this server.';

lang/en/privacy.php

@@ -36,7 +36,7 @@
 $string['trace:preprocessingcomponent'] = 'Pre-processing {$a->component} ({$a->progress}/{$a->total}) ({$a->datetime})';
 $string['trace:fetchcomponents'] = 'Fetching data from {$a->total} components ({$a->datetime})';
 $string['trace:deletingapproved'] = 'Performing removal of {$a->total} approved contexts ({$a->datetime})';
-$string['trace:deletingapprovedusers'] = 'Performing removal of users in {$a->total} approved component for context {$a->contextid} ({$a->datetime})';
+$string['trace:deletingapprovedusers'] = 'Performing removal of users in {$a->total} approved components for context {$a->contextid} ({$a->datetime}).';
 $string['trace:deletingcontext'] = 'Performing removal of context from {$a->total} components ({$a->datetime})';
 $string['navigation'] = 'Navigation';
 $string['trace:deletinguser'] = 'Performing removal of user from {$a->total} components ({$a->datetime})';

lang/en/question.php

@@ -269,7 +269,7 @@
 $string['questionname'] = 'Question name';
 $string['questionno'] = 'Question {$a}';
 $string['questionsaveerror'] = 'Errors occur during saving question - ({$a})';
-$string['questionsinuse'] = '(* Questions marked by an asterisk are already in use in some quizzes. These question will not be deleted from these quizzes but only from the category list.)';
+$string['questionsinuse'] = '(* Questions marked by an asterisk are already in use in some quizzes. These questions will not be deleted from these quizzes but only from the category list.)';
 $string['questionsmovedto'] = 'Questions still in use moved to "{$a}" in the parent course category.';
 $string['questionsrescuedfrom'] = 'Questions saved from context {$a}.';
 $string['questionsrescuedfrominfo'] = 'These questions (some of which may be hidden) were saved when context {$a} was deleted because they are still used by some quizzes or other activities.';
@@ -429,7 +429,7 @@
 $string['restartwiththeseoptions'] = 'Start again with these options';
 $string['restoremultipletopcats'] = 'The backup file contains more than one top-level question categories for context {$a}.';
 $string['rightanswer'] = 'Right answer';
-$string['rightanswer_help'] = 'an automatically generated summary of the correct response. This can be limited, so you may wish to consider explaining the correct solution in the general feedback for the question, and turning this option off.';
+$string['rightanswer_help'] = 'An automatically generated summary of the correct response. This can be limited, so you may wish to consider explaining the correct solution in the general feedback for the question, and turning this option off.';
 $string['saved'] = 'Saved: {$a}';
 $string['saveflags'] = 'Save the state of the flags';
 $string['settingsformultipletries'] = 'Multiple tries';

lang/en/repository.php

@@ -109,7 +109,7 @@
 $string['enternewname'] = 'Please enter the new file name';
 $string['error'] = 'An unknown error occurred!';
 $string['errordoublereference'] = 'Unable to overwrite file with a shortcut/alias because shortcuts to this file already exist.';
-$string['errornotyourfile'] = 'You cannot pick file which is not added by your';
+$string['errornotyourfile'] = 'You can only pick files which you added.';
 $string['erroruniquename'] = 'Repository instance name should be unique';
 $string['errorpostmaxsize'] = 'The file you tried to upload is too large for the server to process.';
 $string['errorwhilecommunicatingwith'] = 'Error while communicating with the repository \'{$a}\'.';
@@ -143,7 +143,7 @@
 $string['instancesforcourses'] = '{$a} Course-wide common instance(s)';
 $string['instancesforusers'] = '{$a} User private instance(s)';
 $string['invalidjson'] = 'Invalid JSON string';
-$string['invalidplugin'] = 'Invalid repository {$a} plug-in';
+$string['invalidplugin'] = 'Invalid repository {$a} plugin';
 $string['invalidfiletype'] = '{$a} filetype cannot be accepted.';
 $string['invalidrepositoryid'] = 'Invalid repository ID';
 $string['invalidparams'] = 'Invalid parameters';
@@ -189,7 +189,7 @@
 $string['overwrite'] = 'Overwrite';
 $string['overwriteall'] = 'Overwrite all';
 $string['path'] = 'Path';
-$string['plugin'] = 'Repository plug-ins';
+$string['plugin'] = 'Repository plugins';
 $string['pluginerror'] = 'Errors in repository plugin.';
 $string['popup'] = 'Click "Login" button to log in';
 $string['popupblockeddownload'] = 'The downloading window is blocked, please allow the popup window, and try again.';
@@ -248,7 +248,7 @@
 $string['xhtmlerror'] = 'You are probably using an XHTML strict header. Certain YUI components don\'t work in this mode; please turn it off.';
 $string['ziped'] = 'Compress folder successfully';
 $string['privacy:metadata:repository'] = 'The Repository component stores the repository types within the core subsystem.';
-$string['privacy:metadata:repository_instances'] = 'The Repository plug-ins component stores user repository instances data within the core subsystem.';
+$string['privacy:metadata:repository_instances'] = 'The Repository plugins component stores user repository instances data within the core subsystem.';
 $string['privacy:metadata:repository_instances:name'] = 'The custom name of the repository instance.';
 $string['privacy:metadata:repository_instances:typeid'] = 'The ID type of the repository instance.';
 $string['privacy:metadata:repository_instances:userid'] = 'The ID of the user owning the repository instance.';

lang/en/webservice.php

@@ -104,7 +104,7 @@
 $string['checkusercapability'] = 'Check user capability';
 $string['checkusercapabilitydescription'] = 'The user should have appropriate capabilities according to the protocols used, for example webservice/rest:use, webservice/soap:use. To achieve this, create a web services role with protocol capabilities allowed and assign it to the web services user as a system role.';
 $string['information'] = 'Information';
-$string['installserviceshortnameerror'] = 'Coding error: the service shortname "{$a}" should have contains numbers, letters  and _-.. only.';
+$string['installserviceshortnameerror'] = 'Coding error: the service shortname "{$a}" can only contain alphanumeric characters (letters and numbers), underscore (_), hyphen (-) or full stop (.)';
 $string['installexistingserviceshortnameerror'] = 'A web service with the shortname "{$a}" already exists. Can not install/update a different web service with this shortname.';
 $string['invalidextparam'] = 'Invalid external api parameter: {$a}';
 $string['invalidextresponse'] = 'Invalid external api response: {$a}';
@@ -141,7 +141,7 @@
 $string['potusers'] = 'Not authorised users';
 $string['potusersmatching'] = 'Not authorised users matching';
 $string['print'] = 'Print all';
-$string['privacy:metadata:serviceusers'] = 'A list of users who can use a certain external services';
+$string['privacy:metadata:serviceusers'] = 'A list of users who can use a certain external service';
 $string['privacy:metadata:serviceusers:iprestriction'] = 'IP restricted to use the service';
 $string['privacy:metadata:serviceusers:timecreated'] = 'The date at which the record was created';
 $string['privacy:metadata:serviceusers:userid'] = 'The ID of the user';

mod/assign/lang/en/assign.php

@@ -186,7 +186,7 @@
 $string['eventstatementaccepted'] = 'The user has accepted the statement of the submission.';
 $string['eventsubmissionconfirmationformviewed'] = 'Submission confirmation form viewed.';
 $string['eventsubmissioncreated'] = 'Submission created.';
-$string['eventsubmissionduplicated'] = 'The user duplicated his submission.';
+$string['eventsubmissionduplicated'] = 'The user duplicated their submission.';
 $string['eventsubmissionformviewed'] = 'Submission form viewed.';
 $string['eventsubmissiongraded'] = 'The submission has been graded.';
 $string['eventsubmissionlocked'] = 'The submissions have been locked for a user.';