Merge branch 'MDL-68753-master-enfix' of git://github.com/mudrd8mz/moodle

diff --cc lang/en/admin.php
Simple merge

diff --cc lang/en/badges.php
Simple merge

diff --cc lang/en/contentbank.php
Simple merge

diff --cc lang/en/role.php
index 3095d56,a616b73..b284206
--- 1/lang/en/role.php
--- 2/lang/en/role.php
+++ b/lang/en/role.php
@@@ -153,10 -153,9 +153,10 @@@ $string['confirmunassignno'] = 'Cancel'
  $string['contentbank:access'] = 'Access the content bank';
  $string['contentbank:deleteanycontent'] = 'Delete any content from the content bank';
  $string['contentbank:deleteowncontent'] = 'Delete content from own content bank';
- $string['contentbank:manageanycontent'] = 'Manage any content from the content bank (rename, move, publish, share, etc.)';
- $string['contentbank:manageowncontent'] = 'Manage content from own content bank (rename, move, publish, share, etc.)';
- $string['contentbank:upload'] = 'Upload new content in the content bank';
+ $string['contentbank:manageanycontent'] = 'Manage any content from the content bank';
+ $string['contentbank:manageowncontent'] = 'Manage content from own content bank';
+ $string['contentbank:upload'] = 'Upload new content to the content bank';
 +$string['contentbank:useeditor'] = 'Create or edit content using a content type editor';
  $string['context'] = 'Context';
  $string['course:activityvisibility'] = 'Hide/show activities';
  $string['course:bulkmessaging'] = 'Send a message to many people';