MDL-10797 Merged lang strings into lang/en_utf8/admin.php and error.php

admin/lang.php

@@ -61,20 +61,9 @@
     $strfilecreated = get_string('filecreated', 'admin');
     $strprev = get_string('previous');
     $strnext = get_string('next');
-    $strlocalstringcustomization = 'Local string customization';            // TODO / FIXME
-    $strlangpackmaintaining = 'Language pack maintaining';                  // TODO / FIXME
-    $strnomissingstrings = 'No missing strings';                            // TODO / FIXME
-
-    // TODO / FIXME add into en_utf8/error.php
-    $string['cannoteditmasterlang'] = 'You do not have permission to edit master language package. This
-        permission is controlled by the capability "moodle/site:langeditmaster". Set this capability
-        to allow you to edit master language packages in case you are the maintainer of a package.';
-    $string['cannotcustomizelocallang'] = 'You do not have permission to customize the strings translation.
-        This permission is controlled by the capability "moodle/site:langeditlocal". Set this capability
-        to allow you to edit local language packages in case you want to modify translations for your site.';
-
-    // TODO/FIXME add into en_utf8/admin.php:
-    // $string['numberofmissingstrings'] = 'Number of missing strings: $a';
+    $strlocalstringcustomization = get_string('localstringcustomization', 'admin');
+    $strlangpackmaintaining = get_string('langpackmaintaining', 'admin');
+    $strnomissingstrings = get_string('nomissingstrings', 'admin');
 
     $currentlang = current_language();
 

lang/en_utf8/admin.php

@@ -364,6 +364,7 @@ $string['langimportsuccess'] = 'Language pack successfully upgraded';
 $string['langlist'] = 'Languages on language menu';
 $string['langmenu'] = 'Display language menu';
 $string['langnoeditenglish'] = 'Can\'t overwrite the base english language pack. Please switch lang directory to make local changes';
+$string['langpackmaintaining'] = 'Language pack maintaining';
 $string['langpackremoved'] = 'Language pack was uninstalled';
 $string['langpacks'] = 'Language packs';
 $string['langpackupdated'] = 'Language pack $a was successfully installed';
@@ -373,6 +374,7 @@ $string['latexpreamble'] = 'LaTeX preamble';
 $string['latexsettings'] = 'LaTeX renderer Settings';
 $string['latinexcelexport'] = 'Excel encoding';
 $string['localetext'] = 'Sitewide locale';
+$string['localstringcustomization'] = 'Local string customization';
 $string['location'] = 'Location';
 $string['locationsettings'] = 'Location settings';
 $string['log'] = 'Logs';
@@ -422,6 +424,7 @@ $string['mysql416required'] = 'MySQL 4.1.16 is the minimum version required for
 $string['nobookmarksforuser'] = 'You do not have any bookmarks.';
 $string['nodefaultuserrolelists'] = 'Don\'t return all default role users';
 $string['nolangupdateneeded'] = 'All your language packs are up to date, no update is needed';
+$string['nomissingstrings'] = 'No missing strings';
 $string['nonewsettings'] = 'No new settings were added during this upgrade.';
 $string['nonexistentbookmark'] = 'The bookmark you requested does not exist.';
 $string['nonmetacoursesyncroleids'] = 'Roles that are not synchronised to metacourses';
@@ -431,6 +434,7 @@ $string['notifications'] = 'Notifications';
 $string['notifyloginfailures'] = 'Email login failures to';
 $string['notifyloginthreshold'] = 'Threshold for email notifications';
 $string['notloggedinroleid'] = 'Role for visitors';
+$string['numberofmissingstrings'] = 'Number of missing strings: $a';
 $string['opensslrecommended'] = 'Installing the optional OpenSSL library is highly recommended -- it enables Moodle Networking functionality.';
 $string['opentogoogle'] = 'Open to Google';
 $string['optionalmaintenancemessage'] = 'Optional maintenance messsage';

lang/en_utf8/error.php

@@ -5,8 +5,10 @@
 $string['adminprimarynoedit'] = 'The primary admin cannot be edited by others';
 $string['cannotcreatelangdir'] = 'Cannot create lang dir.';
 $string['cannotcreatetempdir'] = 'Cannot create temp dir.';
+$string['cannotcustomizelocallang'] = 'You do not have permission to customize the strings translation.  This permission is controlled by the capability "moodle/site:langeditlocal". Set this capability to allow you to edit local language packages in case you want to modify translations for your site.';
 $string['cannotdownloadcomponents'] = 'Cannot download components.';
 $string['cannotdownloadzipfile'] = 'Cannot download ZIP file.';
+$string['cannoteditmasterlang'] = 'You do not have permission to edit master language package. This permission is controlled by the capability "moodle/site:langeditmaster". Set this capability to allow you to edit master language packages in case you are the maintainer of a package.';
 $string['cannotfindcomponent'] = 'Cannot find component.';
 $string['cannotsavemd5file'] = 'Cannot save md5 file.';
 $string['cannotsavezipfile'] = 'Cannot save ZIP file.';

lib/grade/grade_grade.php

@@ -576,5 +576,4 @@ class grade_grade extends grade_object {
     }
 
 }
-
 ?>