Merged string fixes from stable

diff --git a/enrol/ldap/config.html b/enrol/ldap/config.html
index 968c2cf9cb567b35620bf9be63d6535a6c0a5bf4..77c92dcb5dfa72a0e7afc3879222c48e56ceb393 100755 (executable)
--- a/enrol/ldap/config.html
+++ b/enrol/ldap/config.html
@@ -212,7 +212,7 @@ if (!isset($frm->enrol_ldap_template)) {
     <td colspan="3">
         <table>
             <tr>
-                <th><?php print_string('role_name', 'enrol_ldap'); ?></th>
+                <th><?php print_string('roles', 'role'); ?></th>
                 <th><?php print_string('enrol_ldap_contexts', 'enrol_ldap'); ?></th>
                 <th><?php print_string('enrol_ldap_memberattribute', 'enrol_ldap'); ?></th>
             </tr>
@@ -384,10 +384,4 @@ if (!isset($frm->enrol_ldap_template)) {
     </td>
 </tr>
 
-<tr>
-   <td colspan="2">
-        <h4><?php print_string("enrol_ldap_general_options", "enrol_ldap") ?> </h4>
-   </td>
-</tr>
-
 </table>

diff --git a/lang/en_utf8/enrol_ldap.php b/lang/en_utf8/enrol_ldap.php
index 567f7a4be14aa1ce3a2ac8b4addfd35c9d1a247f..987a0a173507d53685dd8fa313ad84d7012da211 100644 (file)
--- a/lang/en_utf8/enrol_ldap.php
+++ b/lang/en_utf8/enrol_ldap.php
@@ -30,6 +30,7 @@ $string['enrol_ldap_bind_dn'] = 'If you want to use bind-user to search users,
                                  \'cn=ldapuser,ou=public,o=org\'';
 $string['enrol_ldap_bind_pw'] = 'Password for bind-user.';
 $string['enrol_ldap_category'] = 'The category for auto-created courses.';
+$string['enrol_ldap_contexts'] = 'LDAP contexts';
 $string['enrol_ldap_course_fullname'] = 'Optional: LDAP field to get the full name from.';
 $string['enrol_ldap_course_idnumber'] = 'Map to the unique identifier in LDAP, usually
                                          <em>cn</em> or <em>uid</em>. It is 
@@ -43,8 +44,10 @@ $string['enrol_ldap_general_options'] = 'General Options';
 $string['enrol_ldap_host_url'] = 'Specify LDAP host in URL-form like 
                                   \'ldap://ldap.myorg.com/\' 
                                   or \'ldaps://ldap.myorg.com/\'';
+$string['enrol_ldap_memberattribute'] = 'LDAP member attribute';
 $string['enrol_ldap_objectclass'] = 'objectClass used to search courses. Usually
                                      \'posixGroup\'.';
+$string['enrol_ldap_roles'] = 'Role mapping';
 $string['enrol_ldap_search_sub'] = 'Search group memberships from subcontexts.';
 $string['enrol_ldap_server_settings'] = 'LDAP Server Settings';
 $string['enrol_ldap_student_contexts'] = 'List of contexts where groups with student