Merged string fixes from stable

diff --git a/lang/en_utf8/form.php b/lang/en_utf8/form.php
index 85689674a6b5c281ec499231aa6054c9a1d3b94a..8ff186d2ec9e8d703ed4bd577b67e66ea84aff2c 100644 (file)
--- a/lang/en_utf8/form.php
+++ b/lang/en_utf8/form.php
@@ -17,8 +17,10 @@ $string['requiredelement'] = 'Required field';
 $string['general'] = 'General';
 $string['optional'] = 'Optional';
 $string['unmaskpassword'] = 'Unmask';
-$string['modstandardels']='Common Module Settings';
+$string['revealpassword'] = 'Reveal';
+$string['modstandardels']='Common module settings';
 $string['miscellaneoussettings']='Miscellaneous Settings';
+$string['othersettings']='Other settings';
 $string['addfields']='Add $a fields to form';
 $string['day']='Day';
 $string['month']='Month';
@@ -26,7 +28,7 @@ $string['year']='Year';
 $string['hour']='Hour';
 $string['minute']='Minute';
 
-$string['advancedelement']='Advanced Element';
+$string['advancedelement']='Advanced element';
 $string['hideadvanced']='Hide Advanced';
 $string['showadvanced']='Show Advanced';
 

diff --git a/lang/en_utf8/scorm.php b/lang/en_utf8/scorm.php
index d49aa813fe3108811b035baa53388ad8be587929..e065bc34e5d4a17314cb2de99f734ec39f0cb6e5 100644 (file)
--- a/lang/en_utf8/scorm.php
+++ b/lang/en_utf8/scorm.php
@@ -6,7 +6,9 @@ $string['advanced'] = 'Parameters';
 $string['asset'] = 'Asset';
 $string['assetlaunched'] = 'Asset - Viewed';
 $string['attempt'] = 'attempt';
-$string['attempts'] = 'attempts';
+$string['attempt1'] = '1 attempt';
+$string['attempts'] = 'Attempts';
+$string['attemptsx'] = '$a attempts';
 $string['attr_error'] = 'Bad value for attribute ($a->attr) in tag $a->tag.';
 $string['autocontinue'] = 'Auto-Continue';
 $string['averageattempt'] = 'Average attempts';

diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index fbe880b6849564d9fa6f34cc4ccaaf07159e196f..75e67dbc7a9c0027e7798d426841db2513577a76 100644 (file)
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -31,10 +31,8 @@ class mod_scorm_mod_form extends moodleform_mod {
 
 //-------------------------------------------------------------------------------
 // Other Settings
-        $mform->addElement('header', 'advanced', get_string('othersettings','scorm'));
+        $mform->addElement('header', 'advanced', get_string('othersettings', 'form'));
 
-// Grading
-        $mform->addElement('static', 'grade', get_string('grades'));
 // Grade Method
         $mform->addElement('select', 'grademethod', get_string('grademethod', 'scorm'), $SCORM_GRADE_METHOD);
         $mform->setHelpButton('grademethod', array('grademethod',get_string('grademethod', 'scorm')), 'scorm');
@@ -50,15 +48,14 @@ class mod_scorm_mod_form extends moodleform_mod {
 
 // Attempts
         $mform->addElement('static', '', '' ,'<hr />');
-        $mform->addElement('static', 'attempts', get_string('attempts','scorm'));
 
 // Max Attempts
         $attempts = array(0 => get_string('nolimit','scorm'));
         for ($i=1; $i<=$CFG->scorm_maxattempts; $i++) {
             if ($i == 1) {
-                $attempts[$i] = $i . ' ' . get_string('attempt','scorm');
+                $attempts[$i] = get_string('attempt1','scorm');
             } else {
-                $attempts[$i] = $i . ' ' . get_string('attempts','scorm');
+                $attempts[$i] = get_string('attemptsx','scorm', $i);
             }
         }
         $mform->addElement('select', 'maxattempt', get_string('maximumattempts', 'scorm'), $attempts);