From f3bdb845c47a226db841040c33fe5eec7530a8a9 Mon Sep 17 00:00:00 2001
From: Helen Foster <helen@moodle.org>
Date: Wed, 3 Sep 2014 10:59:31 +0200
Subject: [PATCH] MDL-47031 Merge English strings from the en_fix language pack

---
 auth/ldap/lang/en/auth_ldap.php | 2 +-
 lang/en/completion.php          | 2 +-
 lang/en/webservice.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/auth/ldap/lang/en/auth_ldap.php b/auth/ldap/lang/en/auth_ldap.php
index 34df891b811..07b69a4a485 100644
--- a/auth/ldap/lang/en/auth_ldap.php
+++ b/auth/ldap/lang/en/auth_ldap.php
@@ -125,7 +125,7 @@ $string['notcalledfromserver'] = 'Should not be called from the web server!';
 $string['noupdatestobedone'] = "No updates to be done\n";
 $string['nouserentriestoremove'] = "No user entries to be removed\n";
 $string['nouserentriestorevive'] = "No user entries to be revived\n";
-$string['nouserstobeadded'] = "No users to be added\n";
+$string['nouserstobeadded'] = 'No user entries to be added';
 $string['ntlmsso_attempting'] = 'Attempting Single Sign On via NTLM...';
 $string['ntlmsso_failed'] = 'Auto-login failed, try the normal login page...';
 $string['ntlmsso_isdisabled'] = 'NTLM SSO is disabled.';
diff --git a/lang/en/completion.php b/lang/en/completion.php
index 0f551c5b114..2573482a470 100644
--- a/lang/en/completion.php
+++ b/lang/en/completion.php
@@ -117,7 +117,7 @@ $string['dependencies'] = 'Dependencies';
 $string['dependenciescompleted'] = 'Completion of other courses';
 $string['editcoursecompletionsettings'] = 'Edit course completion settings';
 $string['enablecompletion'] = 'Enable completion tracking';
-$string['enablecompletion_help'] = 'Once enabled, the completion tracking settings are displayed in the completion tracking page, and in the activity settings.';
+$string['enablecompletion_help'] = 'If enabled, activity completion conditions may be set in the activity settings and/or course completion conditions may be set.';
 $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/lang/en/webservice.php b/lang/en/webservice.php
index 90c8d9e0bdf..e3e5bdb7092 100644
--- a/lang/en/webservice.php
+++ b/lang/en/webservice.php
@@ -113,7 +113,7 @@ $string['invalidiptoken'] = 'Invalid token - your IP is not supported';
 $string['invalidtimedtoken'] = 'Invalid token - token expired';
 $string['invalidtoken'] = 'Invalid token - token not found';
 $string['iprestriction'] = 'IP restriction';
-$string['iprestriction_help'] = 'The user will need to call web service from the listed IPs.';
+$string['iprestriction_help'] = 'The user will need to call the web service from the listed IPs (separated by commas).';
 $string['key'] = 'Key';
 $string['keyshelp'] = 'The keys are used to access your Moodle account from external applications.';
 $string['manageprotocols'] = 'Manage protocols';