Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle

admin/tool/task/lang/en/tool_task.php

@@ -30,7 +30,7 @@
 $string['nextruntime'] = 'Next run';
 $string['pluginname'] = 'Scheduled task configuration';
 $string['resettasktodefaults'] = 'Reset task schedule to defaults';
-$string['resettasktodefaults_help'] = 'This will discard any local changes and revert the schedule for this task to it\'s original settings';
+$string['resettasktodefaults_help'] = 'This will discard any local changes and revert the schedule for this task back to its original settings.';
 $string['scheduledtasks'] = 'Scheduled tasks';
 $string['taskscheduleday'] = 'Day';
 $string['taskscheduleday_help'] = 'Day of month field for task schedule. The field uses the same format as unix cron. Some examples are:<br/><ul><li><strong>*</strong> Every day</li><li><strong>*/2</strong> Every 2nd day</li><li><strong>1</strong> The first of every month</li><li><strong>1,15</strong> The first and fifteenth of every month</li></ul>';

lang/en/badges.php

@@ -60,7 +60,7 @@
 $string['archivehelp'] = '<p>This option means that the badge will be marked as "retired" and will no longer appear in the list of badges. Users will no longer be able to earn this badge, however existing badge recipients will still be able to display this badge on their profile page and push it to their external backpacks.</p>
 <p>If you would like your users to retain access to the earned badges it is important to select this option instead of fully deleting badges.</p>';
 $string['attachment'] = 'Attach badge to message';
-$string['attachment_help'] = 'If checked, an issued badge file will be attached to the recepient\'s email for download. Email attachments must be enabled in site settings to use this option.';
+$string['attachment_help'] = 'If enabled, an issued badge file will be attached to the recipient\'s email for download. (Attachments must be enabled in Site administration > Plugins > Message outputs > Email to use this option.)';
 $string['award'] = 'Award badge';
 $string['awardedtoyou'] = 'Issued to me';
 $string['awardoncron'] = 'Access to the badges was successfully enabled. Too many users can instantly earn this badge. To ensure site performance, this action will take some time to process.';

lang/en/enrol.php

@@ -80,7 +80,7 @@
 $string['expirynotifyenroller'] = 'Enroller only';
 $string['expirynotifyhour'] = 'Hour to send enrolment expiry notifications';
 $string['expirythreshold'] = 'Notification threshold';
-$string['expirythreshold_help'] = 'How long before expiration should be users notified?';
+$string['expirythreshold_help'] = 'How long before enrolment expiry should users be notified?';
 $string['finishenrollingusers'] = 'Finish enrolling users';
 $string['instanceeditselfwarning'] = 'Warning:';
 $string['instanceeditselfwarningtext'] = 'You are enrolled into this course through this enrolment method, changes may affect your access to this course.';

mod/quiz/report/statistics/lang/en/quiz_statistics.php

@@ -33,7 +33,7 @@
 $string['attemptsfirst'] = 'first attempt';
 $string['backtoquizreport'] = 'Back to main statistics report page.';
 $string['calculatefrom'] = 'Calculate statistics from';
-$string['calculatingallstats'] = 'Calculating statistics for quiz, questions and analysing repsonse data';
+$string['calculatingallstats'] = 'Calculating statistics for quiz, questions and analysing response data';
 $string['cic'] = 'Coefficient of internal consistency (for {$a})';
 $string['completestatsfilename'] = 'completestats';
 $string['count'] = 'Count';

mod/scorm/lang/en/scorm.php

@@ -246,7 +246,7 @@
 
 * No - Navigation buttons are not shown
 * Under content - Navigation buttons are shown below the SCORM package content
-* Floating - Navigation buttons are shown floating, with the postition from the top and from the left determined by the package.';
+* Floating - Navigation buttons are shown floating, with the position from the top and from the left determined by the package.';
 $string['navdesc'] = 'This setting specifies whether to show or hide navigation buttons and their position.';
 $string['navpositionleft'] = 'Position of navigation buttons from left in pixels.';
 $string['navpositiontop'] = 'Position of navigation buttons from top in pixels.';

portfolio/boxnet/lang/en/portfolio_boxnet.php

@@ -23,32 +23,32 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['apiv1migration_message_content'] = 'As part of the recent Moodle upgrade to 2.6, the Box.net portfolio plugin has been disabled. To re-enable it, you need to re-configure it as described in the documentation {$a->docsurl}.';
-$string['apiv1migration_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Box.net APIv1 migration.';
-$string['apiv1migration_message_subject'] = 'Important information regarding Box.net portfolio plugin';
+$string['apiv1migration_message_content'] = 'As part of the recent Moodle upgrade to 2.6, the Box portfolio plugin has been disabled. To re-enable it, you need to re-configure it as described in the documentation {$a->docsurl}.';
+$string['apiv1migration_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Box APIv1 migration.';
+$string['apiv1migration_message_subject'] = 'Important information regarding Box portfolio plugin';
 $string['clientid'] = 'Client ID';
 $string['clientsecret'] = 'Client secret';
 $string['existingfolder'] = 'Existing folder to put file(s) into';
 $string['folderclash'] = 'The folder you asked to create already exists!';
-$string['foldercreatefailed'] = 'Failed to create your target folder on box.net';
-$string['folderlistfailed'] = 'Failed to retrieve a folder listing from box.net';
+$string['foldercreatefailed'] = 'Failed to create your target folder on Box';
+$string['folderlistfailed'] = 'Failed to retrieve a folder listing from Box';
 $string['missinghttps'] = 'HTTPS required';
-$string['missinghttps_help'] = 'Box.net will only work with an HTTPS enabled website.';
+$string['missinghttps_help'] = 'Box will only work with an HTTPS enabled website.';
 $string['missingoauthkeys'] = 'Missing client ID and secret';
-$string['missingoauthkeys_help'] = 'There is no client ID or secret configured for this plugin. You can get one of these from Box.net development page.';
+$string['missingoauthkeys_help'] = 'There is no client ID or secret configured for this plugin. You can get one of these from Box development page.';
 $string['newfolder'] = 'New folder to put file(s) into';
 $string['noauthtoken'] = 'Could not retrieve an authentication token for use in this session';
 $string['notarget'] = 'You must specify either an existing folder or a new folder to upload into';
-$string['noticket'] = 'Could not retrieve a ticket from box.net to begin the authentication session';
-$string['password'] = 'Your box.net password (will not be stored)';
-$string['pluginname'] = 'Box.net';
-$string['sendfailed'] = 'Failed to send content to box.net: {$a}';
+$string['noticket'] = 'Could not retrieve a ticket from Box to begin the authentication session';
+$string['password'] = 'Your Box password (will not be stored)';
+$string['pluginname'] = 'Box';
+$string['sendfailed'] = 'Failed to send content to Box: {$a}';
 $string['setupinfo'] = 'Setup instructions';
-$string['setupinfodetails'] = 'To obtain a client ID and secret, log in to Box.net and visit the <a href="{$a->servicesurl}">Box.net developers page</a>. Follow \'Create new application\' and create a new application for your Moodle site. The client ID and secret are displayed in the \'OAuth2 parameters\' section of the application edit form. Optionally, you can also provide other information about your Moodle site.';
+$string['setupinfodetails'] = 'To obtain a client ID and secret, log in to Box and visit the <a href="{$a->servicesurl}">Box developers page</a>. Follow \'Create new application\' and create a new application for your Moodle site. The client ID and secret are displayed in the \'OAuth2 parameters\' section of the application edit form. Optionally, you can also provide other information about your Moodle site.';
 $string['sharedfolder'] = 'Shared';
 $string['sharefile'] = 'Share this file?';
 $string['sharefolder'] = 'Share this new folder?';
 $string['targetfolder'] = 'Target folder';
 $string['tobecreated'] = 'To be created';
-$string['username'] = 'Your box.net username (will not be stored)';
-$string['warninghttps'] = 'Box.net requires your website to be using HTTPS in order for the portfolio to work.';
+$string['username'] = 'Your Box username (will not be stored)';
+$string['warninghttps'] = 'Box requires your website to be using HTTPS in order for the portfolio to work.';

portfolio/googledocs/lang/en/portfolio_googledocs.php

@@ -23,14 +23,14 @@
  */
 
 $string['clientid'] = 'Client ID';
-$string['noauthtoken'] = 'An authentication token has not been recieved from google. Please ensure you are allowing moodle to access your google account';
+$string['noauthtoken'] = 'An authentication token has not been received from Google. Please ensure you are allowing Moodle to access your Google account';
 $string['nooauthcredentials'] = 'OAuth credentials required.';
-$string['nooauthcredentials_help'] = 'To use the Google Docs portfolio plugin you must configure OAuth credentials in the portfolio settings.';
+$string['nooauthcredentials_help'] = 'To use the Google Drive portfolio plugin you must configure OAuth credentials in the portfolio settings.';
 $string['nosessiontoken'] = 'A session token does not exist preventing export to google.';
-$string['oauthinfo'] = '<p>To use this plugin, you must register your site with Google, as described in the documentation <a href="{$a->docsurl}">Google OAuth 2.0 setup</a>.</p><p>As part of the registration process, you will need to enter the following URL as \'Authorized Redirect URIs\':</p><p>{$a->callbackurl}</p>Once registered, you will be provided with a client ID and secret which can be used to configure all Google Docs and Picasa plugins.</p>';
-$string['oauth2upgrade_message_subject'] = 'Important information regarding Google Docs portfolio plugin';
-$string['oauth2upgrade_message_content'] = 'As part of the upgrade to Moodle 2.3, the Google Docs portfolio plugin has been disabled. To re-enable it, your Moodle site needs to be registered with Google, as described in the documentation {$a->docsurl}, in order to obtain a client ID and secret. The client ID and secret can then be used to configure all Google Docs and Picasa plugins.';
+$string['oauthinfo'] = '<p>To use this plugin, you must register your site with Google, as described in the documentation <a href="{$a->docsurl}">Google OAuth 2.0 setup</a>.</p><p>As part of the registration process, you will need to enter the following URL as \'Authorized Redirect URIs\':</p><p>{$a->callbackurl}</p>Once registered, you will be provided with a client ID and secret which can be used to configure all Google Drive and Picasa plugins.</p>';
+$string['oauth2upgrade_message_subject'] = 'Important information regarding Google Drive portfolio plugin';
+$string['oauth2upgrade_message_content'] = 'As part of the upgrade to Moodle 2.3, the Google Drive portfolio plugin has been disabled. To re-enable it, your Moodle site needs to be registered with Google, as described in the documentation {$a->docsurl}, in order to obtain a client ID and secret. The client ID and secret can then be used to configure all Google Drive and Picasa plugins.';
 $string['oauth2upgrade_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Google OAuth 2.0 setup.';
-$string['pluginname'] = 'Google Docs';
+$string['pluginname'] = 'Google Drive';
 $string['sendfailed'] = 'The file {$a} failed to transfer to google';
 $string['secret'] = 'Secret';

portfolio/picasa/lang/en/portfolio_picasa.php

@@ -26,9 +26,9 @@
 $string['noauthtoken'] = 'An authentication token has not been recieved from google. Please ensure you are allowing moodle to access your google account';
 $string['nooauthcredentials'] = 'OAuth credentials required.';
 $string['nooauthcredentials_help'] = 'To use the Picasa portfolio plugin you must configure OAuth credentials in the portfolio settings.';
-$string['oauthinfo'] = '<p>To use this plugin, you must register your site with Google, as described in the documentation <a href="{$a->docsurl}">Google OAuth 2.0 setup</a>.</p><p>As part of the registration process, you will need to enter the following URL as \'Authorized Redirect URIs\':</p><p>{$a->callbackurl}</p>Once registered, you will be provided with a client ID and secret which can be used to configure all Google Docs and Picasa plugins.</p>';
+$string['oauthinfo'] = '<p>To use this plugin, you must register your site with Google, as described in the documentation <a href="{$a->docsurl}">Google OAuth 2.0 setup</a>.</p><p>As part of the registration process, you will need to enter the following URL as \'Authorized Redirect URIs\':</p><p>{$a->callbackurl}</p>Once registered, you will be provided with a client ID and secret which can be used to configure all Google Drive and Picasa plugins.</p>';
 $string['oauth2upgrade_message_subject'] = 'Important information regarding Picasa portfolio plugin';
-$string['oauth2upgrade_message_content'] = 'As part of the upgrade to Moodle 2.3, the Picasa portfolio plugin has been disabled. To re-enable it, your Moodle site needs to be registered with Google, as described in the documentation {$a->docsurl}, in order to obtain a client ID and secret. The client ID and secret can then be used to configure all Google Docs and Picasa plugins.';
+$string['oauth2upgrade_message_content'] = 'As part of the upgrade to Moodle 2.3, the Picasa portfolio plugin has been disabled. To re-enable it, your Moodle site needs to be registered with Google, as described in the documentation {$a->docsurl}, in order to obtain a client ID and secret. The client ID and secret can then be used to configure all Google Drive and Picasa plugins.';
 $string['oauth2upgrade_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Google OAuth 2.0 setup.';
 $string['pluginname'] = 'Picasa';
 $string['sendfailed'] = 'The file {$a} failed to transfer to picasa';

repository/boxnet/lang/en/repository_boxnet.php

@@ -24,29 +24,29 @@
  */
 
 $string['apikey'] = 'API key';
-$string['apiv1migration_message_content'] = 'As part of the recent Moodle upgrade (2.6, 2.5.3, 2.4.7), the Box.net repository plugin has been disabled. To re-enable it, you need to re-configure it as described in the documentation {$a->docsurl}.';
-$string['apiv1migration_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Box.net APIv1 migration.';
-$string['apiv1migration_message_subject'] = 'Important information regarding Box.net repository plugin';
-$string['boxnet:view'] = 'View box.net repository';
-$string['cannotcreatereference'] = 'Cannot create a reference, not enough permissions to share the file on Box.net.';
+$string['apiv1migration_message_content'] = 'As part of the recent Moodle upgrade (2.6, 2.5.3, 2.4.7), the Box repository plugin has been disabled. To re-enable it, you need to re-configure it as described in the documentation {$a->docsurl}.';
+$string['apiv1migration_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Box APIv1 migration.';
+$string['apiv1migration_message_subject'] = 'Important information regarding Box repository plugin';
+$string['boxnet:view'] = 'View Box repository';
+$string['cannotcreatereference'] = 'Cannot create a reference, not enough permissions to share the file on Box.';
 $string['clientid'] = 'Client ID';
 $string['clientsecret'] = 'Client secret';
-$string['configplugin'] = 'Box.net configuration';
-$string['filesourceinfo'] = 'Box.net ({$a->fullname}): {$a->filename}';
-$string['information'] = 'Get a client ID and secret from the <a href="https://app.box.com/developers/services">Box.net developer page</a> for your Moodle site.';
+$string['configplugin'] = 'Box configuration';
+$string['filesourceinfo'] = 'Box ({$a->fullname}): {$a->filename}';
+$string['information'] = 'Get a client ID and secret from the <a href="https://app.box.com/developers/services">Box developer page</a> for your Moodle site.';
 $string['invalidpassword'] = 'Invalid password';
-$string['migrationadvised'] = 'It appears that you were using Box.net with the API version 1, have you run the <a href="{$a}">migration tool</a> to convert the old references?';
-$string['migrationinfo'] = '<p>As part of the migration to the new API provided by Box.net, your file references have to be migrated. Unfortunately the reference system is not compatible with the API v2, so we are going to download them and convert them to real files.</p>
+$string['migrationadvised'] = 'It appears that you were using Box with the API version 1, have you run the <a href="{$a}">migration tool</a> to convert the old references?';
+$string['migrationinfo'] = '<p>As part of the migration to the new API provided by Box, your file references have to be migrated. Unfortunately the reference system is not compatible with the API v2, so we are going to download them and convert them to real files.</p>
 <p>Please also be aware that the migration can <strong>take a very long time</strong>, depending on how many references are used, and how large their files are.</p>
 <p>You can run the migration tool by clicking the button below, or alternatively by executing the CLI script: repository/boxnet/cli/migrationv1.php.</p>
 <p>Find out more <a href="{$a->docsurl}">here</a>.</p>';
-$string['migrationtool'] = 'Box.net APIv1 migration tool';
+$string['migrationtool'] = 'Box APIv1 migration tool';
 $string['nullfilelist'] = 'There are no files in this repository';
 $string['password'] = 'Password';
-$string['pluginname_help'] = 'Repository on Box.net';
-$string['pluginname'] = 'Box.net';
+$string['pluginname_help'] = 'Repository on Box';
+$string['pluginname'] = 'Box';
 $string['runthemigrationnow'] = 'Run the migration tool now';
-$string['saved'] = 'Box.net data saved';
+$string['saved'] = 'Box data saved';
 $string['shareurl'] = 'Share URL';
-$string['username'] = 'Username for Box.net';
-$string['warninghttps'] = 'Box.net requires your website to be using HTTPS in order for the repository to work.';
+$string['username'] = 'Username for Box';
+$string['warninghttps'] = 'Box requires your website to be using HTTPS in order for the repository to work.';

repository/googledocs/lang/en/repository_googledocs.php

@@ -26,8 +26,8 @@
 $string['configplugin'] = 'Configure Google Drive plugin';
 $string['googledocs:view'] = 'View Google Drive repository';
 $string['oauthinfo'] = '<p>To use this plugin, you must register your site with Google, as described in the documentation <a href="{$a->docsurl}">Google OAuth 2.0 setup</a>.</p><p>As part of the registration process, you will need to enter the following URL as \'Authorized Redirect URIs\':</p><p>{$a->callbackurl}</p>Once registered, you will be provided with a client ID and secret which can be used to configure all Google Drive and Picasa plugins.</p><p>Please also note that you will have to enable the service \'Drive API\'.</p>';
-$string['oauth2upgrade_message_subject'] = 'Important information regarding Google Docs repository plugin';
-$string['oauth2upgrade_message_content'] = 'As part of the upgrade to Moodle 2.3, the Google Docs portfolio plugin has been disabled. To re-enable it, your Moodle site needs to be registered with Google, as described in the documentation {$a->docsurl}, in order to obtain a client ID and secret. The client ID and secret can then be used to configure all Google Docs and Picasa plugins.';
+$string['oauth2upgrade_message_subject'] = 'Important information regarding Google Drive repository plugin';
+$string['oauth2upgrade_message_content'] = 'As part of the upgrade to Moodle 2.3, the Google Drive portfolio plugin has been disabled. To re-enable it, your Moodle site needs to be registered with Google, as described in the documentation {$a->docsurl}, in order to obtain a client ID and secret. The client ID and secret can then be used to configure all Google Drive and Picasa plugins.';
 $string['oauth2upgrade_message_small'] = 'This plugin has been disabled, as it requires configuration as described in the documentation Google OAuth 2.0 setup.';
 $string['pluginname'] = 'Google Drive';
 $string['secret'] = 'Secret';