From: skodak <skodak>
Date: Thu, 5 Apr 2007 09:17:50 +0000 (+0000)
Subject: MDL-9219 Replace Inherit with Not set on role definition page; merged from MOODLE_18_... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=42b5bb64985dafa1c71851065e1b74e51b579412;p=moodle.git

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

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index 60ace42e1d..6af4d4a85e 100755
--- 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 0fc53ab3c2..851f1210c5 100644
--- 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';