Merged changes from STABLE for MDL-8654

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 94ecec90d9833fa6de3894c3e9518de8e62d7c46..13f5a82f1954ad1010dd1e55eb33815c268b9ac9 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -81,6 +81,7 @@ $string['configdisplayloginfailures'] = 'This will display information to select
 $string['configdocroot'] = 'Defines the path to the Moodle Docs. You can change this if you wish to have your own custom online documentation. Howerver, if you do that, make sure that the paths in your documentation follow the same format as http://docs.moodle.org.';
 $string['configdoctonewwindow'] = 'If you enable this, then links to Moodle Docs will be showed in a new window.';
 $string['configeditorfontlist'] = 'Select the fonts that should appear in the editor\'s drop-down list.';
+$string['configeditordictionary'] = 'This value will be used if aspell doesn\'t have dictionary for users own language.';
 $string['configenableajax'] = 'This setting allows you to control the use of AJAX (advanced client/server interfaces using Javascript) across the whole site.  With this setting enabled users can sill make a choice in their profile, otherwise AJAX is disabled for everybody.';
 $string['configenablecourserequests'] = 'This will allow any user to request a course be created.';
 $string['configenableglobalsearch'] = 'This setting enables global text searching in resources and activities, it is not compatible with PHP 4.';
@@ -243,11 +244,14 @@ $string['editennotallowed'] = 'Language en_utf8 cannot be edited with this page
 $string['edithelpdocs'] = 'Edit help documents';
 $string['editlang'] = '<b>Edit</b>';
 $string['editorbackgroundcolor'] = 'Background color';
+$string['editordictionary'] = 'Editor dictionary';
 $string['editorfontfamily'] = 'Font family';
 $string['editorfontlist'] = 'Font list';
 $string['editorfontsize'] = 'Font size';
 $string['editorhidebuttons'] = 'Hidden buttons';
 $string['editorkillword'] = 'Word format filter';
+$string['editorspellinghelp'] = 'Enable or disable spell-checking. When enabled, <strong>aspell</strong> must be installed on the server.';
+$string['editorspelling'] = 'Editor spelling';
 $string['editstrings'] = 'Edit words or phrases';
 $string['enableajax'] = 'Enable AJAX';
 $string['enablecourserequests'] = 'Enable course requests';