MDL-17009 restore of mnet users - New lang strings. Merged from 19_STABLE

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index b690dd1cf5b27647f7a2146518b794e6326335da..4c4d8045373271fa6a70f50fbc408cbaa75b421d 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -529,6 +529,8 @@ $string['minpasswordnonalphanum'] = 'Non-alphanumeric characters';
 $string['minpasswordupper'] = 'Uppercase letters';
 $string['misc'] = 'Miscellaneous';
 $string['missinglangparent'] = 'Missing parent language <em>$a->parent</em> of <em>$a->lang</em>.';
+$string['mnetrestore_extusers_admin'] = '<strong>Note:</strong> This backup file seems to come from a different Moodle installation and contains remote Moodle Network user accounts. The restore process will try to match the Moodle Network hosts for all created users. Those not matching will be automatically switched to internal authentication (instead of mnet one). The restore log will inform you about that.';
+$string['mnetrestore_extusers_noadmin'] = '<strong>Note:</strong> This backup file seems to come from a different Moodle installation and contains remote Moodle Network user accounts. You are not allowed to execute this type of restore. Contact the administrator of the site or, alternatively, restore this course without any user information (modules, files...)';
 $string['mnetrestore_extusers'] = '<strong>Note:</strong> This backup file contains remote Moodle Network user accounts which will be restored as part of the process.';
 $string['mnetrestore_extusers_mismatch'] = '<strong>Note:</strong> This backup file apparently originates from a different Moodle installation and contains remote Moodle Network user accounts that may fail to restore. This operation is unsupported. If you are certain that it was created on this Moodle installation, or you can ensure that all the needed Moodle Network Hosts are configured, you may want to still try the restore.';
 $string['modsettings'] = 'Manage activities';

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 2443c054cdeb2435ac16eb354e18395028ee6074..5c5f6edeb3b8df5fd34fab9442005b1608305784 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1143,7 +1143,7 @@ $string['noteachersyet'] = 'No teachers in this course yet';
 $string['notenrollable'] = 'This course is not enrollable at the moment.';
 $string['notenrolled'] = '$a is not enrolled in this course.';
 $string['notenrolledprofile'] = 'This profile is not available because this user is not enrolled in this course.';
-$string['noteuserschangednonetocourse'] = 'Note: course users need to be restored when restoring user data (in activities, files or messages). This setting has been changed for you.';
+$string['noteuserschangednonetocourse'] = '<strong>Note:</strong> Course users need to be restored when restoring user data (in activities, files or messages). This setting has been changed for you.';
 $string['nothingnew'] = 'Nothing new since your last login';
 $string['nothingtodisplay'] = 'Nothing to display';
 $string['notice'] = 'Notice';