From 9f809b1818cec2192cf28aebdc0d08474cc9aa13 Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Tue, 25 Oct 2016 20:26:36 +0200 Subject: [PATCH] MDL-56542 lang: Merge English strings from the en_fix language pack --- enrol/lti/lang/en/enrol_lti.php | 4 +++- lang/en/auth.php | 2 +- mod/assign/lang/en/assign.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/enrol/lti/lang/en/enrol_lti.php b/enrol/lti/lang/en/enrol_lti.php index 8b2cd1e4b80..7435eadd464 100644 --- a/enrol/lti/lang/en/enrol_lti.php +++ b/enrol/lti/lang/en/enrol_lti.php @@ -41,7 +41,9 @@ $string['maxenrolled'] = 'Maximum enrolled users'; $string['maxenrolled_help'] = 'The maximum number of remote users who can access the tool. If set to zero, the number of enrolled users is unlimited.'; $string['maxenrolledreached'] = 'The maximum number of remote users allowed to access the tool has been reached.'; $string['membersync'] = 'User synchronisation'; -$string['membersync_help'] = 'Whether an account is created for each remote user and the user is enrolled in this course.'; +$string['membersync_help'] = 'Whether a scheduled task synchronises enrolled users in the remote system with enrolments in this course, creating an account for each remote user as necessary, and enrolling or unenrolling them as required. + +If set to no, at the moment when a remote user accesses the tool, an account will be created for them and they will be automatically enrolled.'; $string['membersyncmode'] = 'User synchronisation mode'; $string['membersyncmode_help'] = 'Whether remote users should be enrolled and/or unenrolled from this course.'; $string['membersyncmodeenrolandunenrol'] = 'Enrol new and unenrol missing users'; diff --git a/lang/en/auth.php b/lang/en/auth.php index f540be787c2..c27e9b9e3c5 100644 --- a/lang/en/auth.php +++ b/lang/en/auth.php @@ -51,7 +51,7 @@ $string['auth_remove_user'] = 'Specify what to do with internal user account dur $string['auth_remove_user_key'] = 'Removed ext user'; $string['auth_sync_suspended'] = 'When enabled, the suspended attribute will be used to update the local user account\'s suspension status.'; $string['auth_sync_suspended_key'] = 'Synchronize local user suspension status'; -$string['auth_sync_script'] = 'User account syncronisation'; +$string['auth_sync_script'] = 'User account synchronisation'; $string['auth_updatelocal'] = 'Update local'; $string['auth_updatelocal_expl'] = '

Update local: If enabled, the field will be updated (from external auth) every time the user logs in or there is a user synchronization. Fields set to update locally should be locked.

'; $string['auth_updateremote'] = 'Update external'; diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php index 4236cc4ec5b..40e371d8a8c 100644 --- a/mod/assign/lang/en/assign.php +++ b/mod/assign/lang/en/assign.php @@ -138,8 +138,8 @@ $string['deleteallsubmissions'] = 'Delete all submissions'; $string['description'] = 'Description'; $string['downloadall'] = 'Download all submissions'; $string['download all submissions'] = 'Download all submissions in a zip file.'; -$string['downloadasfolders'] = 'Download as separate folders'; -$string['downloadasfolders_help'] = 'When enabled downloaded files will be placed in separate folders and files will not be renamed.'; +$string['downloadasfolders'] = 'Download submissions in folders'; +$string['downloadasfolders_help'] = 'If the assignment submission is more than a single file, then submissions may be downloaded in folders. Each submission is put in a separate folder, with the folder structure kept for any subfolders, and files are not renamed.'; $string['downloadselectedsubmissions'] = 'Download selected submissions'; $string['duedate'] = 'Due date'; $string['duedatecolon'] = 'Due date: {$a}';