fixes for 'Choose legend/header text carefully - short and non-repeated' MDL-7780

diff --git a/course/edit_form.php b/course/edit_form.php
index b4eb8c815eeb13a28434da8061e1be205dc2259a..e0dfec65ac995c9c0069d1d854dcd292f117e502 100644 (file)
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -244,7 +244,7 @@ class course_edit_form extends moodleform {
         $choices = array();
         $choices['0'] = get_string('no');
         $choices['1'] = get_string('yes');
-        $mform->addElement('select', 'expirynotify', get_string('expirynotify'), $choices);
+        $mform->addElement('select', 'expirynotify', get_string('notify'), $choices);
         $mform->setHelpButton('expirynotify', array('expirynotify', get_string('expirynotify')), true);
         $mform->setDefault('expirynotify', 0);
 
@@ -262,12 +262,12 @@ class course_edit_form extends moodleform {
         $mform->setDefault('expirythreshold', 10 * 86400);
 
 //--------------------------------------------------------------------------------
-        $mform->addElement('header','', get_string('groupmode'));
+        $mform->addElement('header','', get_string('groups', 'group'));
 
         $choices = array();
-        $choices[NOGROUPS] = get_string('groupsnone');
-        $choices[SEPARATEGROUPS] = get_string('groupsseparate');
-        $choices[VISIBLEGROUPS] = get_string('groupsvisible');
+        $choices[NOGROUPS] = get_string('no');
+        $choices[SEPARATEGROUPS] = get_string('separate');
+        $choices[VISIBLEGROUPS] = get_string('visible');
         $mform->addElement('select', 'groupmode', get_string('groupmode'), $choices);
         $mform->setHelpButton('groupmode', array('groupmode', get_string('groupmode')), true);
         $mform->setDefault('groupmode', 0);

diff --git a/lang/en_utf8/form.php b/lang/en_utf8/form.php
index 5985d5722c67b97f5bfc2b2208c40522bca311c0..7270fe45eec0deb22c05fac26f313a845cbd824b 100644 (file)
--- a/lang/en_utf8/form.php
+++ b/lang/en_utf8/form.php
@@ -15,7 +15,8 @@ $string['err_required']='You must supply a value here.';
 $string['nomethodforaddinghelpbutton'] = 'There is no method for adding a help button to form element $a->name (class $a->classname)';
 $string['nonexistentformelements'] = 'Trying to add help buttons to nonexistent form elements : $a';
 $string['requiredelement'] = 'Required field';
-$string['general'] = 'General Settings';
+$string['general'] = 'General';
+$string['optional'] = 'Optional';
 $string['modstandardels']='Common Module Settings';
 $string['miscellaneoussettings']='Miscellaneous Settings';
 $string['addfields']='Add $a fields to form';

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 21e4eb33c2bab6803a903b8ff78f35688f6091f8..d9e971ec690132c1f38d0a53725d507b0033c365 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1,4 +1,4 @@
-<?PHP // $Id$ 
+<?PHP // $Id$
       // moodle.php - created with Moodle 1.7 beta + (2006101003)
 
 
@@ -1005,6 +1005,7 @@ $string['nothingtodisplay'] = 'Nothing to display';
 $string['noticenewerbackup'] = 'This backup file has been created with Moodle $a->backuprelease ($a->backupversion) and it\'s newer than your currently installed Moodle $a->serverrelease ($a->serverversion). This could cause some inconsistencies because backwards compatibility of backup files cannot be guaranteed.';
 $string['notifications'] = 'Notifications';
 $string['notifyloginfailuresmessage'] = '$a->time, IP: $a->ip, User: $a->info';
+$string['notify'] = 'Notify';
 $string['notifyloginfailuresmessageend'] = 'You can view these logs at $a/course/log.php?id=1&chooselog=1&modid=site_errors.';
 $string['notifyloginfailuresmessagestart'] = 'Here is a list of failed login attempts at $a since you were last notified';
 $string['notifyloginfailuressubject'] = '$a :: Failed logins notification';
@@ -1206,6 +1207,7 @@ $string['selectednowmove'] = '$a files selected for moving. Now go to the destin
 $string['selectnos'] = 'Select all \'no\'';
 $string['selectperiod'] = 'Select period';
 $string['senddetails'] = 'Send my details via email';
+$string['separate'] = 'Separate';
 $string['separateandconnected'] = 'Separate and Connected ways of knowing';
 $string['serverlocaltime'] = 'Server\'s local time';
 $string['settings'] = 'Settings';