Merged MDL-12801 from MOODLE_18_STABLE (improve roles terminology for system)

diff --git a/lang/en_utf8/help/assignroles.html b/lang/en_utf8/help/assignroles.html
index cbbb98bc6938c33919bef1e033085ca6a7273fd2..d9847e37a849e2becb329005abd706abb44f71a1 100644 (file)
--- a/lang/en_utf8/help/assignroles.html
+++ b/lang/en_utf8/help/assignroles.html
@@ -11,8 +11,10 @@ in that role, for the current context and all
 Contexts:
 </p>
 <ol>
-<li>Site/System</li>
+<li>System (the entire installation)</li>
+<li>Front page (the "site course")</li>
 <li>Course Categories</li>
+<li>Course Sub-categories</li>
 <li>Courses</li>
 <li>Blocks and Activities</li>
 </ol>

diff --git a/lang/en_utf8/help/contexts.html b/lang/en_utf8/help/contexts.html
index c9dde9d0fd53de4a71400d2330826749285d0bbc..1825b37f16fd3d4b6dd7773e1b1147cdde8be6d1 100644 (file)
--- a/lang/en_utf8/help/contexts.html
+++ b/lang/en_utf8/help/contexts.html
@@ -7,7 +7,8 @@
    inherited from "higher" to "lower" contexts.</p>
 
 <ol>
-<li>Site (System)</li>
+<li>System (the entire installation)</li>
+<li>Front page (the "site course")</li>
 <li>Course Categories</li>
 <li>Course Sub-categories</li>
 <li>Courses</li>

diff --git a/lang/en_utf8/help/permissions.html b/lang/en_utf8/help/permissions.html
index ab779ee8d579eba44a71776ae3c59f2857beeed1..f1753094c90852dc87d7a835dba7675ad8280fd3 100644 (file)
--- a/lang/en_utf8/help/permissions.html
+++ b/lang/en_utf8/help/permissions.html
@@ -18,7 +18,7 @@ to one of four values:
     gets assigned to someone (eg in a course) that has this permission for 
     a capability, then the actual permission they'll have will just be 
     the same as they already had at higher-level contexts (eg categories
-    or site level).  Ultimately, if permission is never allowed at any 
+    or system level).  Ultimately, if permission is never allowed at any 
     level, then the user will have no permission for that capability.
     </dd>
 
@@ -42,9 +42,9 @@ to one of four values:
     deny permissions to a role in a way that can NOT be overridden at 
     any lower context.  A good example of when you might need this is 
     when an admin wants to prohibit one person from starting new 
-    discussions in any forum on the whole site.   In this case they 
+    discussions in any forum on the whole system.   In this case they 
     can create a role with that capability set to "Prohibit" and then 
-    assign it to that user in the site context.
+    assign it to that user in the system context.
   </dd>
 
 </dl>
@@ -64,7 +64,7 @@ to one of four values:
     
 <p> For example, a student has two roles in a course, one that allows 
     them to start new discussions, one that prevents them.  In this case, 
-    we check the categories and the site contexts, looking for another 
+    we check the categories and the system contexts, looking for another 
     defined permission to help us decide.  If we don't find one, then 
     permission is PREVENT by default (because the two settings cancelled 
     each other out, and thus you have no permission).

diff --git a/lang/en_utf8/help/roles.html b/lang/en_utf8/help/roles.html
index dd645810d8af5223601984aeb3d91722632e7e30..e133454e0010f308db71cba4351a1b22fbf91912 100644 (file)
--- a/lang/en_utf8/help/roles.html
+++ b/lang/en_utf8/help/roles.html
@@ -1,7 +1,7 @@
 <h1>Roles</h1>
 
 <p> 
-A role is a collection of permissions defined for the whole site 
+A role is a collection of permissions defined for the whole system 
 that you can assign to specific users in specific contexts.
 </p>
 

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 9e33db48c46e267769aea610dae67d2c8266754c..19c9f224d1cc23181fa5630070981469452b8475 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -249,7 +249,7 @@ $string['copyingsitefiles'] = 'Copying site files used in course';
 $string['copyinguserfiles'] = 'Copying user files';
 $string['copyingzipfile'] = 'Copying zip file';
 $string['copyrightnotice'] = 'Copyright notice';
-$string['coresystem'] = 'Core system';
+$string['coresystem'] = 'System';
 $string['cost'] = 'Cost';
 $string['costdefault'] = 'Default cost';
 $string['counteditems'] = '$a->count $a->items';

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 023d342c1df9941a45978b3a814818d8a5b93e5a..914701079ad5aed9f7038ff89fa06946dc9e73db 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -8,7 +8,7 @@ $string['allowassign'] = 'Allow role assignments';
 $string['allowoverride'] = 'Allow role overrides';
 $string['assignroles'] = 'Assign roles';
 $string['assignrolesin'] = 'Assign roles in $a';
-$string['assignglobalroles'] = 'Assign global roles';
+$string['assignglobalroles'] = 'Assign system roles';
 $string['blog:create'] = 'Create new blog entries';
 $string['blog:manageentries'] = 'Edit and manage entries';
 $string['blog:manageofficialtags'] = 'Manage official tags';
@@ -74,8 +74,12 @@ $string['errorbadroleshortname'] = 'Incorrect role name';
 $string['errorexistsrolename'] = 'Role name already exists';
 $string['errorexistsroleshortname'] = 'Role name already exists';
 $string['existingusers'] = '$a existing users';
+<<<<<<< role.php
 $string['globalrole'] = 'Global role';
 $string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire site, including the front page and all the courses.';
+=======
+$string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire system, including the front page and all the courses.';
+>>>>>>> 1.23.2.11
 $string['inherit'] = 'Inherit';
 $string['legacy:admin'] = 'LEGACY ROLE: Administrator';
 $string['legacy:coursecreator'] = 'LEGACY ROLE: Course Creator';