Merged string fixes from stable

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 87d2845606ac24371ea321c455606e00da779b66..d4dbbd7b109398020ae62f9f83a43b866f19955f 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -427,9 +427,9 @@ $string['timezoneforced'] = 'This is forced by the site administrator';
 $string['timezoneisforcedto'] = 'Force all users to use';
 $string['timezonenotforced'] = 'Users can choose their own timezone';
 $string['unbookmarkthispage'] = 'unbookmark this page';
-$string['unicodeupgradenotice'] = 'In Moodle 1.6 we have migrated all languages to Unicode.  To complete the upgrade for this site, you need to convert all the data in your database to Unicode using our migration script.  <a href=\"utfdbmigrate.php\">Click here to run the migration script now</a>!';
-$string['unicoderecommended'] = 'UTF-8 database migration is recommended, new installations should be performed into unicode enabled databases';
-$string['unicoderequired'] = 'Unicode enabled database is required for installation or upgrade. Please make sure that database is properly migrated to unicode before upgrading to this version.';
+$string['unicodeupgradenotice'] = 'In Moodle 1.6 we have migrated all languages to Unicode.  To complete the upgrade for this site, you need to convert all the data in your database to Unicode (UTF-8) using our migration script.  <a href=\"utfdbmigrate.php\">Click here to run the migration script now</a>!';
+$string['unicoderecommended'] = 'Storing all your data in Unicode (UTF=8) is recommended. New installations should be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
+$string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
 $string['uninstall'] = 'Uninstall selected language pack';
 $string['uninstallconfirm'] = 'You are about to completely uninstall language pack $a, are you sure?';
 $string['unsupported'] = 'Unsupported';