From 5e2cd4637ea1f5bc539bcb0a8bd2d3fedfd0d2a0 Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Wed, 3 May 2017 21:54:18 +0200 Subject: [PATCH] MDL-58749 lang: Merge English strings from the en_fix language pack Significant string change: * errorinvalidbyhour,core_calendar - correcting number from 59 to 23 --- enrol/ldap/lang/en/enrol_ldap.php | 4 ++-- lang/en/admin.php | 2 +- lang/en/badges.php | 8 ++++---- lang/en/calendar.php | 2 +- lang/en/error.php | 2 +- lang/en/install.php | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/enrol/ldap/lang/en/enrol_ldap.php b/enrol/ldap/lang/en/enrol_ldap.php index 70a3d3ee0b8..ac5c83d2304 100644 --- a/enrol/ldap/lang/en/enrol_ldap.php +++ b/enrol/ldap/lang/en/enrol_ldap.php @@ -62,8 +62,8 @@ $string['course_summary'] = 'Optional: LDAP attribute to get the summary from'; $string['course_summary_key'] = 'Summary'; $string['course_summary_updateonsync'] = 'Update summary during synchronization script'; $string['course_summary_updateonsync_key'] = 'Update summary'; -$string['createcourseextid'] = 'CREATE User enrolled to a nonexistant course \'{$a->courseextid}\''; -$string['createnotcourseextid'] = 'User enrolled to a nonexistant course \'{$a->courseextid}\''; +$string['createcourseextid'] = 'CREATE User enrolled to a non-existing course \'{$a->courseextid}\''; +$string['createnotcourseextid'] = 'User enrolled to a non-existing course \'{$a->courseextid}\''; $string['creatingcourse'] = 'Creating course \'{$a}\'...'; $string['duplicateshortname'] = "Course creation failed. Duplicate short name. Skipping course with idnumber '{\$a->idnumber}'..."; $string['editlock'] = 'Lock value'; diff --git a/lang/en/admin.php b/lang/en/admin.php index 5698dc087c1..5a857b9862e 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -599,7 +599,7 @@ $string['iplookupinfo'] = 'By default Moodle uses the free online NetGeo (The In It is recommended to install local copy of free GeoLite City database from MaxMind.
IP address location is displayed on simple map or using Google Maps. Please note that you need to have a Google account and apply for free Google Maps API key to enable interactive maps.'; $string['iplookupmaxmindnote'] = 'This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/.'; -$string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. For increased security and improved integrations with other systems is highly recommended to migrate your site to HTTPS.'; +$string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. It is strongly recommended to migrate your site to HTTPS for increased security and improved integration with other systems.'; $string['keeptagnamecase'] = 'Keep tag name casing'; $string['lang'] = 'Default language'; $string['langcache'] = 'Cache language menu'; diff --git a/lang/en/badges.php b/lang/en/badges.php index 2341a484f0d..7ec2703f12f 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -85,9 +85,9 @@ $string['backpackconnection_help'] = 'This page allows you to set up connection Currently, only Mozilla OpenBadges Backpack is supported. You need to sign up for a backpack service before trying to set up backpack connection on this page.'; $string['backpackconnectioncancelattempt'] = 'Connect using a different email address'; -$string['backpackconnectionconnect'] = 'Connect to Backpack'; +$string['backpackconnectionconnect'] = 'Connect to backpack'; $string['backpackconnectionresendemail'] = 'Resend verification email'; -$string['backpackconnectionunexpectedresult'] = 'There was a problem contacting the Backpack. Please try again.

If this problem persists, please contact your system administrator.'; +$string['backpackconnectionunexpectedresult'] = 'There was a problem connecting to your backpack. Please try again.

If the problem persists, contact your administrator.'; $string['backpackdetails'] = 'Backpack settings'; $string['backpackemail'] = 'Email address'; $string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.'; @@ -100,7 +100,7 @@ $string['backpackemailverifyemailbody'] = 'Hi, A new connection to your OpenBadges backpack has been requested from \'{$a->sitename}\' using your email address. -To confirm and activate the connection to your backpack, please click the link below. +To confirm and activate the connection to your backpack, please go to {$a->link} @@ -110,7 +110,7 @@ If you need help, please contact the site administrator, {$a->admin}'; $string['backpackemailverifyemailsubject'] = '{$a}: OpenBadges Backpack email verification'; $string['backpackemailverifypending'] = 'A verification email has been sent to {$a}. Click on the verification link in the email to activate your Backpack connection.'; -$string['backpackemailverifysuccess'] = 'Thanks for verifying your email address. You are now connected to your Backpack.'; +$string['backpackemailverifysuccess'] = 'Thanks for verifying your email address. You are now connected to your backpack.'; $string['backpackemailverifytokenmismatch'] = 'The token in the link you clicked does not match the stored token. Make sure you clicked the link in most recent email you received.'; $string['backpackimport'] = 'Badge import settings'; $string['backpackimport_help'] = 'After the backpack connection is successfully established, badges from your backpack can be displayed on your badges page and your profile page. diff --git a/lang/en/calendar.php b/lang/en/calendar.php index 0288482d574..55c988ef563 100644 --- a/lang/en/calendar.php +++ b/lang/en/calendar.php @@ -64,7 +64,7 @@ $string['errorcannotimport'] = 'You cannot set up a calendar subscription at thi $string['errorhasuntilandcount'] = 'Either UNTIL or COUNT may appear in a recurrence rule, but UNTIL and COUNT MUST NOT occur in the same recurrence rule.'; $string['errorinvalidbydaysuffix'] = 'Valid values for the day of the week parts of the BYDAY rule are MO, TU, WE, TH, FR, SA and SU'; $string['errorinvalidbydayprefix'] = 'Integer values preceding BYDAY rules can only be present for MONTHLY or YEARLY RRULE.'; -$string['errorinvalidbyhour'] = 'Valid values for the BYHOUR rule are 0 to 59.'; +$string['errorinvalidbyhour'] = 'Valid values for the BYHOUR rule are 0 to 23.'; $string['errorinvalidinterval'] = 'The value for the INTERVAL rule must be a positive integer.'; $string['errorinvalidbyminute'] = 'Valid values for the BYMINUTE rule are 0 to 59.'; $string['errorinvalidbymonth'] = 'Valid values for the BYMONTH rule are 1 to 12.'; diff --git a/lang/en/error.php b/lang/en/error.php index 93db2e57ee6..9c79e2dc39d 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -390,7 +390,7 @@ $string['moduledisable'] = 'This module ({$a}) has been disabled for this partic $string['moduledoesnotexist'] = 'This module does not exist'; $string['moduleinstancedoesnotexist'] = 'The instance of this module does not exist'; $string['modulemissingcode'] = 'Module {$a} is missing the code needed to perform this function'; -$string['movecatcontentstoroot'] = 'Moving the category content to root is not allowed. You must move the contents to an existant category!'; +$string['movecatcontentstoroot'] = 'Moving the category content to root is not allowed. You must move the contents to an existing category!'; $string['movecategorynotpossible'] = 'You cannot move category \'{$a}\' into the selected category.'; $string['movecategoryownparent'] = 'You cannot make category \'{$a}\' a parent of itself.'; $string['movecategoryparentconflict'] = 'You cannot make category \'{$a}\' a subcategory of one of its own subcategories.'; diff --git a/lang/en/install.php b/lang/en/install.php index bc5f1a185a8..9e460dc6c4f 100644 --- a/lang/en/install.php +++ b/lang/en/install.php @@ -217,7 +217,7 @@ $string['pathswrongadmindir'] = 'Admin directory does not exist'; $string['pgsqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the PGSQL extension so that it can communicate with PostgreSQL. Please check your php.ini file or recompile PHP.'; $string['phpextension'] = '{$a} PHP extension'; $string['phpversion'] = 'PHP version'; -$string['phpversionhelp'] = '

Moodle requires a PHP version of at least 5.4.4 (7.x has some engine limitations).

+$string['phpversionhelp'] = '

Moodle requires a PHP version of at least 5.4.4 (7.0.x has some engine limitations).

You are currently running version {$a}.

You must upgrade PHP or move to a host with a newer version of PHP.

'; $string['releasenoteslink'] = 'For information about this version of Moodle, please see the release notes at {$a}';