mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-06 00:06:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-28565_M' of git://github.com/nebgor/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-08-09 10:13:18 +02:00
commit 8a015bdb84
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/index.php
View File

@ -133,7 +133,7 @@ if (!core_tables_exist()) {
echo $OUTPUT->box($copyrightnotice, 'copyrightnotice'); echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
echo '<br />'; echo '<br />';
$continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get'); $continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get');
echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/en/License"); echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
echo $OUTPUT->footer(); echo $OUTPUT->footer();
die; die;
} }
@ -467,8 +467,8 @@ if (!empty($CFG->maintenance_enabled)) {
$copyrighttext = '<a href="http://moodle.org/">Moodle</a> '. $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
'<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'. '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'. 'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'. 'and <a href="http://docs.moodle.org/dev/Credits">many other contributors</a>.<br />'.
'<a href="http://docs.moodle.org/en/License">GNU Public License</a>'; '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
echo $OUTPUT->box($copyrighttext, 'copyright'); echo $OUTPUT->box($copyrighttext, 'copyright');
////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////

2
lang/en/moodle.org.php
View File

@ -76,7 +76,7 @@ $string['downloadcore'] = 'Our main method of distribution is via these standard
$string['downloadcoretitle'] = 'Standard Moodle packages'; $string['downloadcoretitle'] = 'Standard Moodle packages';
$string['downloadcvs'] = 'Another way to get the core source code is by using CVS to connect directly to one of our mirrors of the code repository used by Moodle developers. This makes upgrading very easy, even if you have made local changes to the source code.'; $string['downloadcvs'] = 'Another way to get the core source code is by using CVS to connect directly to one of our mirrors of the code repository used by Moodle developers. This makes upgrading very easy, even if you have made local changes to the source code.';
$string['downloadcvstitle'] = 'Moodle via CVS'; $string['downloadcvstitle'] = 'Moodle via CVS';
$string['downloadintro'] = 'Moodle is open source under the <a href="http://docs.moodle.org/en/License">GPL licence</a>. Everything we produce is available for you to download and use for free.'; $string['downloadintro'] = 'Moodle is open source under the <a href="http://docs.moodle.org/dev/License">GPL licence</a>. Everything we produce is available for you to download and use for free.';
$string['downloadlang'] = 'In current versions of Moodle, adding support for new languages has been automated from the administration menu within your site. However, for some older versions of Moodle, new language packs need to be downloaded manually.'; $string['downloadlang'] = 'In current versions of Moodle, adding support for new languages has been automated from the administration menu within your site. However, for some older versions of Moodle, new language packs need to be downloaded manually.';
$string['downloadlangtitle'] = 'Language packs'; $string['downloadlangtitle'] = 'Language packs';
$string['downloadlogotitle'] = 'Moodle logos'; $string['downloadlogotitle'] = 'Moodle logos';

4
lang/en/moodle.php
View File

@ -735,7 +735,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the Moodle License information page for full details: See the Moodle License information page for full details:
http://docs.moodle.org/en/License'; http://docs.moodle.org/dev/License';
$string['gpllicense'] = 'GPL license'; $string['gpllicense'] = 'GPL license';
$string['gpl3'] = 'Copyright (C) 1999 onwards Martin Dougiamas (http://moodle.com) $string['gpl3'] = 'Copyright (C) 1999 onwards Martin Dougiamas (http://moodle.com)
@ -749,7 +749,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the Moodle License information page for full details: See the Moodle License information page for full details:
http://docs.moodle.org/en/License'; http://docs.moodle.org/dev/License';
$string['grade'] = 'Grade'; $string['grade'] = 'Grade';
$string['grades'] = 'Grades'; $string['grades'] = 'Grades';
$string['group'] = 'Group'; $string['group'] = 'Group';