MDL-8090 Merged from stable. Added new strings for lang.php

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 2bd26f4e0e6e04a90fb94d4cf0a808eda0ceaf37..bf64ffa44bced763f919f277e6e4f3e5bddf82ef 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -372,6 +372,9 @@ $string['lang'] = 'Default language';
 $string['lang16notify'] = 'Moodle 1.6 and above allows you to install and update language packs directly from download.moodle.org by following the link below';
 $string['langcache'] = 'Cache language menu';
 $string['langedit'] = 'Language editing';
+$string['langmasterpackage'] = 'Master language pack';
+$string['langmasterenglish'] = 'Master English pack';
+$string['langlocalpackage'] = 'Local modifications';
 $string['langimport'] = 'Language import utility';
 $string['langimportsuccess'] = 'Language pack successfully upgraded';
 $string['langlist'] = 'Languages on language menu';
@@ -382,6 +385,7 @@ $string['langpackremoved'] = 'Language pack was uninstalled';
 $string['langpacks'] = 'Language packs';
 $string['langpackupdated'] = 'Language pack $a was successfully installed';
 $string['langpackwillbeupdated'] = 'Note for translators: During the upgrade, Moodle will try to update your language pack. Your modifications in non-local language folders will be overwritten.';
+$string['langrmyourself'] = 'To prevent data loss, lang.php is not able to overwrite existing file with empty content. Please, remove the file manually in order to get rid of it.';
 $string['languagesettings'] = 'Language settings';
 $string['langupdatecomplete'] = 'Language pack update completed';
 $string['latexpreamble'] = 'LaTeX preamble';