MDL-9219 Replace Inherit with Not set on role definition page; merged from MOODLE_18_...

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index 60ace42e1d90c4c80404b8c7e62d1c8725a7bc02..6af4d4a85eba0a4873bbf2aeac80b21fec5518a2 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -89,7 +89,7 @@
 <?php
     print_heading_with_help(get_string('permissions','role'), 'permissions');
 
-    $strinherit = get_string('inherit','role');
+    $strinherit = get_string('notset','role');
     $strallow = get_string('allow','role');
     $strprevent = get_string('prevent','role');
     $strprohibit = get_string('prohibit','role');

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 0fc53ab3c24bb799efed2e8b9f9c8eaa55da85a9..851f1210c5f8003c026c38b70a90a4ef752d344e 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -73,6 +73,7 @@ $string['manageroles'] = 'Manage roles';
 $string['metaassignerror'] = 'Can not assign this role to user \"$a\" because Manage metacourse capability is needed.';
 $string['metaunassignerror'] = 'Role of user \"$a\" was automatically reassigned, please unassign the role in child courses instead.';
 $string['nocapabilitiesincontext'] = 'No capabilities available in this context';
+$string['notset'] = 'Not set';
 $string['overrideroles'] = 'Override roles';
 $string['overrides'] = 'Overrides';
 $string['permissions'] = 'Permissions';