From 0d86195e8d8133c4b1d6592523b299e91fdab69f Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Wed, 10 May 2017 11:40:40 +0200 Subject: [PATCH] MDL-58877 lang: Merge English strings from the en_fix language pack Significant string changes: * loginerror_cannotcreateaccounts in auth_oauth2 - more understandable error message * config_keep_groups_and_groupings and config_keep_roles_and_enrolments in core_backup - switch fix --- auth/oauth2/lang/en/auth_oauth2.php | 2 +- lang/en/backup.php | 4 ++-- lang/en/completion.php | 2 +- mod/scorm/lang/en/scorm.php | 2 +- repository/onedrive/lang/en/repository_onedrive.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/auth/oauth2/lang/en/auth_oauth2.php b/auth/oauth2/lang/en/auth_oauth2.php index f0715e0a489..c852d352cc5 100644 --- a/auth/oauth2/lang/en/auth_oauth2.php +++ b/auth/oauth2/lang/en/auth_oauth2.php @@ -77,7 +77,7 @@ $string['loginerror_userincomplete'] = 'The user information returned did not co $string['loginerror_nouserinfo'] = 'No user information was returned. The OAuth 2 service may be configured incorrectly.'; $string['loginerror_invaliddomain'] = 'The email address is not allowed at this site.'; $string['loginerror_authenticationfailed'] = 'The authentication process failed.'; -$string['loginerror_cannotcreateaccounts'] = 'The account does not exist and this site does not allow self-registration.'; +$string['loginerror_cannotcreateaccounts'] = 'An account with your email address could not be found.'; $string['notloggedindebug'] = 'The login attempt failed. Reason: {$a}'; $string['notwhileloggedinas'] = 'Linked logins cannot be managed while logged in as another user.'; $string['oauth2:managelinkedlogins'] = 'Manage own linked login accounts'; diff --git a/lang/en/backup.php b/lang/en/backup.php index 0b1e7362605..5e2e3d43ce7 100644 --- a/lang/en/backup.php +++ b/lang/en/backup.php @@ -83,8 +83,8 @@ $string['choosefilefromactivitybackup'] = 'Activity backup area'; $string['choosefilefromactivitybackup_help'] = 'Activity backups made using default settings are stored here.'; $string['choosefilefromautomatedbackup'] = 'Automated backups'; $string['choosefilefromautomatedbackup_help'] = 'Contains automatically generated backups.'; -$string['config_keep_groups_and_groupings'] = 'By default keep current roles and enrolments'; -$string['config_keep_roles_and_enrolments'] = 'By default keep current groups and groupings'; +$string['config_keep_groups_and_groupings'] = 'By default keep current groups and groupings.'; +$string['config_keep_roles_and_enrolments'] = 'By default keep current roles and enrolments.'; $string['config_overwrite_conf'] = 'Allows user to overwrite the current course configuration'; $string['config_overwrite_course_fullname'] = 'By default overwrite course full name with the one from the backup file. This requires "Overwrite course configuration" to be checked and current user to have the capability to change course full name (moodle/course:changefullname)'; $string['config_overwrite_course_shortname'] = 'By default overwrite course short name with the one from the backup file. This requires "Overwrite course configuration" to be checked and current user to have the capability to change course short name (moodle/course:changeshortname)'; diff --git a/lang/en/completion.php b/lang/en/completion.php index dd16d5f874d..bb4f0d7fecb 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -134,7 +134,7 @@ $string['dependenciescompleted'] = 'Completion of other courses'; $string['hiddenrules'] = 'Some settings specific to {$a} have been hidden. To view unselect other activities'; $string['editcoursecompletionsettings'] = 'Edit course completion settings'; $string['enablecompletion'] = 'Enable completion tracking'; -$string['enablecompletion_help'] = 'If enabled, activity completion conditions may be set in the activity settings and/or course completion conditions may be set. It is recommended to have this enabled in order for the course progress dashboard to display meaningful data.'; +$string['enablecompletion_help'] = 'If enabled, activity completion conditions may be set in the activity settings and/or course completion conditions may be set. It is recommended to have this enabled so that meaningful data is displayed in the course overview on the Dashboard.'; $string['enrolmentduration'] = 'Enrolment duration'; $string['enrolmentdurationlength'] = 'User must remain enrolled for'; $string['err_noactivities'] = 'Completion information is not enabled for any activity, so none can be displayed. You can enable completion information by editing the settings for an activity.'; diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index e78e94d495b..f1684b1ba29 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -95,7 +95,7 @@ $string['confirmloosetracks'] = 'WARNING: The package seems to be changed or mod $string['contents'] = 'Contents'; $string['coursepacket'] = 'Course package'; $string['coursestruct'] = 'Course structure'; -$string['crontask'] = 'Background processing for Scorm'; +$string['crontask'] = 'Background processing for SCORM'; $string['currentwindow'] = 'Current window'; $string['datadir'] = 'Filesystem error: Can\'t create course data directory'; $string['defaultdisplaysettings'] = 'Default display settings'; diff --git a/repository/onedrive/lang/en/repository_onedrive.php b/repository/onedrive/lang/en/repository_onedrive.php index d9dfe623da3..83ab88afde6 100644 --- a/repository/onedrive/lang/en/repository_onedrive.php +++ b/repository/onedrive/lang/en/repository_onedrive.php @@ -34,7 +34,7 @@ $string['importskydrivefiles'] = 'Import files from Microsoft SkyDrive repositor $string['internal'] = 'Internal (files stored in Moodle)'; $string['issuer_help'] = 'Select the OAuth 2 service that is configured to talk to the OneDrive API. If the service does not exist yet, you will need to create it.'; $string['issuer'] = 'OAuth 2 service'; -$string['mysitenotfound'] = 'You have never logged into OneDrive before. You must login to OneDrive at least once it before it can be used with Moodle.'; +$string['mysitenotfound'] = 'You have never logged into OneDrive before. You must log in to OneDrive at least once before it can be used with Moodle.'; $string['oauth2serviceslink'] = 'OAuth 2 services configuration'; $string['owner'] = 'Owned by: {$a}'; $string['pluginname'] = 'Microsoft OneDrive';