Merging changes from MOODLE_14_STABLE

diff --git a/admin/editor.html b/admin/editor.html
index 8be6ac141c6cb69f0e67fd1e640eba5f73221849..90dc971b43ca4e01c92e116fb4e295da96b4a0fa 100644 (file)
--- a/admin/editor.html
+++ b/admin/editor.html
@@ -20,8 +20,8 @@
 <tr>
     <td align="right" valign="top"><?php print_string("editorcleanonpaste");?>:</td>
     <td valign="top"><select name="killword">
-    <option value="1"<?php print(!$CFG->editorkillword)?"":" selected=\"selected\"";?>>Yes</option>
-    <option value="0"<?php print(!$CFG->editorkillword)?" selected=\"selected\"":"";?>>No</option>
+    <option value="1"<?php print(!$CFG->editorkillword)?"":" selected=\"selected\"";?>><?php print_string("yes");?></option>
+    <option value="0"<?php print(!$CFG->editorkillword)?" selected=\"selected\"":"";?>><?php print_string("no");?></option>
     </select></td>
     <td valign="top"><?php print_string("edhelpcleanword");?></td>
 </tr>
@@ -33,8 +33,8 @@
         $CFG->editorspelling = false;
     }
     ?>>
-    <option value="1"<?php print(!$CFG->editorspelling)?"":" selected=\"selected\"";?>>Yes</option>
-    <option value="0"<?php print(!$CFG->editorspelling)?" selected=\"selected\"":"";?>>No</option>
+    <option value="1"<?php print(!$CFG->editorspelling)?"":" selected=\"selected\"";?>><?php print_string("yes");?></option>
+    <option value="0"<?php print(!$CFG->editorspelling)?" selected=\"selected\"":"";?>><?php print_string("no");?></option>
     </select></td>
     <td valign="top"><?php print_string("edhelpenablespelling");?></td>
 </tr>