Permalink
Browse files

Merge branch 'MDL-32164-MOODLE_22_STABLE-1' of git://git.luns.net.uk/…

…moodle into MOODLE_22_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed May 8, 2012
2 parents a1f173f + 44f2c95 commit 93af314f7895cf413ea3b63bd5e423b1c6f68c84
Showing with 2 additions and 1 deletion.
  1. +1 −1 mod/data/import_form.php
  2. +1 −0 mod/data/lang/en/data.php
View
@@ -23,7 +23,7 @@ function definition() {
$textlib = textlib_get_instance();
$choices = $textlib->get_encodings();
- $mform->addElement('select', 'encoding', get_string('encoding', 'admin'), $choices);
+ $mform->addElement('select', 'encoding', get_string('fileencoding', 'mod_data'), $choices);
$mform->setDefault('encoding', 'UTF-8');
$submit_string = get_string('submit');
@@ -111,6 +111,7 @@
$string['editorenable'] = 'Enable editor';
$string['emptyadd'] = 'The Add template is empty, generating a default form...';
$string['emptyaddform'] = 'You did not fill out any fields!';
+$string['fileencoding'] = 'Encoding';
$string['entries'] = 'Entries';
$string['entrieslefttoadd'] = 'You must add {$a->entriesleft} more entry/entries in order to complete this activity';
$string['entrieslefttoaddtoview'] = 'You must add {$a->entrieslefttoview} more entry/entries before you can view other participants\' entries.';

0 comments on commit 93af314

Please sign in to comment.