Merge branch 'MDL-58526_m33v2' of https://github.com/sbourget/moodle

diff --cc lib/authlib.php
index 6d4b39d,0d4bbd8..3d85917
--- 1/lib/authlib.php
--- 2/lib/authlib.php
+++ b/lib/authlib.php
@@@ -1043,7 -999,7 +1043,7 @@@ function display_auth_lock_options($set
          } else {
              // Lock fields Only.
              $settings->add(new admin_setting_configselect("auth_{$auth}/field_lock_{$field}",
-                     get_string('auth_fieldlock', 'auth'), '', 'unlocked', $lockoptions));
+                     get_string('auth_fieldlockfield', 'auth', $fieldname), '', 'unlocked', $lockoptions));
          }
      }
 -}
 +}