Skip to content
Browse files

removed empty lines, which for example messed up the display of the l…

…icense terms
  • Loading branch information...
1 parent 8c0ef41 commit 09b78a6b3d44c5ca428b23128d110c670a1720fe gustav_delius committed
Showing with 108 additions and 268 deletions.
  1. +1 −161 config-dist.php
  2. +107 −107 lang/en/moodle.php
View
162 config-dist.php
@@ -1,161 +1 @@
-<?PHP // $Id$
-///////////////////////////////////////////////////////////////////////////
-// //
-// Moodle configuration file //
-// //
-// This file should be renamed "config.php" in the top-level directory //
-// //
-///////////////////////////////////////////////////////////////////////////
-// //
-// NOTICE OF COPYRIGHT //
-// //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment //
-// http://moodle.com //
-// //
-// Copyright (C) 2001-2003 Martin Dougiamas http://dougiamas.com //
-// //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details: //
-// //
-// http://www.gnu.org/copyleft/gpl.html //
-// //
-///////////////////////////////////////////////////////////////////////////
-
-unset($CFG); // Ignore this line
-
-//=========================================================================
-// 1. DATABASE SETUP
-//=========================================================================
-// First, you need to configure the database where all Moodle data //
-// will be stored. This database must already have been created //
-// and a username/password created to access it. //
-// //
-// mysql - the prefix is optional, but useful when installing //
-// into databases that already contain tables. //
-//
-// postgres7 - the prefix is REQUIRED, regardless of whether the //
-// database already contains tables. //
-// //
-// A special case exists when using PostgreSQL databases via sockets. //
-// Define dbhost as follows, leaving dbname, dbuser, dbpass BLANK!: //
-// $CFG->dbhost = " user='muser' password='mpass' dbname='mdata'"; //
-//
-
-$CFG->dbtype = 'mysql'; // mysql or postgres7 (for now)
-$CFG->dbhost = 'localhost'; // eg localhost or db.isp.com
-$CFG->dbname = 'moodle'; // database name, eg moodle
-$CFG->dbuser = 'username'; // your database username
-$CFG->dbpass = 'password'; // your database password
-
-$CFG->dbpersist = true; // Use persistent database connection?
- // (should be 'true' for 99% of sites)
-
-$CFG->prefix = 'mdl_'; // Prefix to use for all table names
-
-
-//=========================================================================
-// 2. WEB SITE LOCATION
-//=========================================================================
-// Now you need to tell Moodle where it is located. Specify the full
-// web address to where moodle has been installed. If your web site
-// is accessible via multiple URLs then choose the most natural one
-// that your students would use. Do not include a trailing slash.
-
-$CFG->wwwroot = 'http://example.com/moodle';
-
-
-//=========================================================================
-// 3. SERVER FILES LOCATION
-//=========================================================================
-// Next, specify the full OS directory path to this same location
-// Make sure the upper/lower case is correct. Some examples:
-//
-// $CFG->dirroot = 'c:\FoxServ\www\moodle'; // Windows
-// $CFG->dirroot = '/var/www/html/moodle'; // Redhat Linux
-// $CFG->dirroot = '/home/example/www/moodle'; // Cpanel host
-
-$CFG->dirroot = '/home/example/www/moodle';
-
-
-//=========================================================================
-// 4. DATA FILES LOCATION
-//=========================================================================
-// Now you need a place where Moodle can save uploaded files. This
-// directory should be readable AND WRITEABLE by the web server user
-// (usually 'nobody' or 'apache'), but it should not be accessible
-// directly via the web.
-//
-// - On hosting systems you might need to make sure that your "group" has
-// no permissions at all, but that "others" have full permissions.
-//
-// - On Windows systems you might specify something like 'C:\moodledata'
-
-$CFG->dataroot = '/home/example/moodledata';
-
-
-//=========================================================================
-// 5. DATA FILES PERMISSIONS
-//=========================================================================
-// The following parameter sets the permissions of new directories
-// created by Moodle within the data directory. The format is in
-// octal format (as used by the Unix utility chmod, for example).
-// The default is usually OK, but you may want to change it to 0750
-// if you are concerned about world-access to the files (you will need
-// to make sure the web server process (eg Apache) can access the files.
-// NOTE: the prefixed 0 is important, and don't use quotes.
-
-$CFG->directorypermissions = 0777;
-
-
-//=========================================================================
-// 6. DIRECTORY LOCATION (most people can just ignore this setting)
-//=========================================================================
-// A very few webhosts use /admin as a special URL for you to access a
-// control panel or something. Unfortunately this conflicts with the
-// standard location for the Moodle admin pages. You can fix this by
-// renaming the admin directory in your installation, and putting that
-// new name here. eg "moodleadmin". This will fix admin links in Moodle.
-
-$CFG->admin = 'admin';
-
-//=========================================================================
-// 7. TEXT FILTERS (most people can just ignore this setting)
-//=========================================================================
-// This is a new and experimental feature that allows text filters to
-// be used on all printed texts in Moodle. To add text filters, you
-// need to specify the path to a file that contains a standard textfilter.
-// The numbers need to start at one and increment up to ten.
-//
-// eg $CFG->textfilter1 = "mod/glossary/dynalink.php";
-// $CFG->textfilter2 = "library/librarylib.php";
-
-
-//=========================================================================
-// ALL DONE! To continue installation, visit your main page with a browser
-//=========================================================================
-
-if (file_exists("$CFG->dirroot/lib/setup.php")) { // Do not edit
- include_once("$CFG->dirroot/lib/setup.php");
-} else {
- if ($CFG->dirroot == dirname(__FILE__)) {
- echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
- echo "<p>Are you sure all your files have been uploaded?</p>";
- } else {
- echo "<p>Error detected in config.php</p>";
- echo "<p>Error in: \$CFG->dirroot = '$CFG->dirroot';</p>";
- echo "<p>Try this: \$CFG->dirroot = '".dirname(__FILE__)."';</p>";
- }
- die;
-}
-
-
-// MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES,
-// RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.
-?>
+<?PHP // $Id$
View
214 lang/en/moodle.php
@@ -251,25 +251,25 @@
$string['email'] = 'Email address';
$string['emailagain'] = 'Email (again)';
$string['emailconfirm'] = 'Confirm your account';
-$string['emailconfirmation'] = 'Hi $a->firstname,
-
-A new account has been requested at \'$a->sitename\'
-using your email address.
-
-To confirm your new account, please go to this web address:
-
-$a->link
-
-In most mail programs, this should appear as a blue link
-which you can just click on. If that doesn\'t work,
-then cut and paste the address into the address
-line at the top of your web browser window.
-
-If you need help, please contact the site administrator,
+$string['emailconfirmation'] = 'Hi $a->firstname,
+
+A new account has been requested at \'$a->sitename\'
+using your email address.
+
+To confirm your new account, please go to this web address:
+
+$a->link
+
+In most mail programs, this should appear as a blue link
+which you can just click on. If that doesn\'t work,
+then cut and paste the address into the address
+line at the top of your web browser window.
+
+If you need help, please contact the site administrator,
$a->admin';
$string['emailconfirmationsubject'] = '$a: account confirmation';
-$string['emailconfirmsent'] = ' <P>An email should have been sent to your address at <B>$a</B>
- <P>It contains easy instructions to complete your registration.
+$string['emailconfirmsent'] = ' <P>An email should have been sent to your address at <B>$a</B>
+ <P>It contains easy instructions to complete your registration.
<P>If you continue to have difficulty, contact the site administrator.';
$string['emaildisplay'] = 'Email display';
$string['emaildisplaycourse'] = 'Allow only other course members to see my email address';
@@ -278,41 +278,41 @@
$string['emailexists'] = 'This email address is already registered.';
$string['emailformat'] = 'Email format';
$string['emailmustbereal'] = 'Note: your email address must be a real one';
-$string['emailpasswordconfirmation'] = 'Hi $a->firstname,
-
-Someone (probably you) has requested a new password for your
-account on \'$a->sitename\'.
-
-To confirm this and have a new password sent to you via email,
-go to the following web address:
-
-$a->link
-
-In most mail programs, this should appear as a blue link
-which you can just click on. If that doesn\'t work,
-then cut and paste the address into the address
-line at the top of your web browser window.
-
-If you need help, please contact the site administrator,
+$string['emailpasswordconfirmation'] = 'Hi $a->firstname,
+
+Someone (probably you) has requested a new password for your
+account on \'$a->sitename\'.
+
+To confirm this and have a new password sent to you via email,
+go to the following web address:
+
+$a->link
+
+In most mail programs, this should appear as a blue link
+which you can just click on. If that doesn\'t work,
+then cut and paste the address into the address
+line at the top of your web browser window.
+
+If you need help, please contact the site administrator,
$a->admin';
$string['emailpasswordconfirmationsubject'] = '$a: change password confirmation';
-$string['emailpasswordconfirmsent'] = 'An email should have been sent to your address at <b>$a</b>.
-<p>It contains easy instructions to confirm and complete this password change.
+$string['emailpasswordconfirmsent'] = 'An email should have been sent to your address at <b>$a</b>.
+<p>It contains easy instructions to confirm and complete this password change.
If you continue to have difficulty, contact the site administrator.';
-$string['emailpasswordsent'] = 'Thank you for confirming the change of password.
-<p>An email containing your new password has been sent to your address at <b>$a->email</b>.
-<p>The new password was automatically generated - you might like to
+$string['emailpasswordsent'] = 'Thank you for confirming the change of password.
+<p>An email containing your new password has been sent to your address at <b>$a->email</b>.
+<p>The new password was automatically generated - you might like to
<a href=$a->link>change your password</a> to something easier to remember.';
$string['enrolledincourse'] = 'Enrolled in course \"$a\"';
$string['enrolledincoursenot'] = 'Not enrolled in course \"$a\"';
$string['enrolmentconfirmation'] = 'You are about to enroll yourself as a member of this course.<br />Are you sure you wish to do this?';
$string['enrolmentkey'] = 'Enrolment key';
-$string['enrolmentkeyfrom'] = 'This course requires an \'enrolment key\' - a one-time<BR>
+$string['enrolmentkeyfrom'] = 'This course requires an \'enrolment key\' - a one-time<BR>
password that you should have received from $a';
-$string['enrolmentkeyhint'] = 'That enrolment key was incorrect, please try again<BR>
+$string['enrolmentkeyhint'] = 'That enrolment key was incorrect, please try again<BR>
(Here\'s a hint - it starts with \'$a\')';
$string['entercourse'] = 'Click to enter this course';
-$string['enteremailaddress'] = 'Enter in your email address to reset your
+$string['enteremailaddress'] = 'Enter in your email address to reset your
password and have the new password sent to you via email.';
$string['error'] = 'Error';
$string['errortoomanylogins'] = 'Sorry, you have exceeded the allowed number of login attempts. Restart your browser.';
@@ -362,18 +362,18 @@
$string['gd2'] = 'GD 2.x is installed';
$string['gdneed'] = 'GD must be installed to see this graph';
$string['gdnot'] = 'GD is not installed';
-$string['gpl'] = 'Copyright (C) 2001-2004 Martin Dougiamas (http://dougiamas.com)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details:
-
+$string['gpl'] = 'Copyright (C) 2001-2004 Martin Dougiamas (http://dougiamas.com)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details:
+
http://www.gnu.org/copyleft/gpl.html';
$string['grade'] = 'Grade';
$string['grades'] = 'Grades';
@@ -468,27 +468,27 @@
$string['loginas'] = 'Login as';
$string['loginguest'] = 'Login as a guest';
$string['loginsite'] = 'Login to the site';
-$string['loginsteps'] = 'Hi! For full access to courses you\'ll need to take
- a minute to create a new account for yourself on this web site.
- Each of the individual courses may also have a one-time
- &quot;enrolment key&quot;, which you won\'t need until later. Here are
- the steps:
- <OL size=2>
- <LI>Fill out the <A HREF=$a>New Account</A> form with your details.
- <LI>An email will be immediately sent to your email address.
- <LI>Read your email, and click on the web link it contains.
- <LI>Your account will be confirmed and you will be logged in.
- <LI>Now, select the course you want to participate in.
- <LI>If you are prompted for a &quot;enrolment key&quot; - use the one
- that your teacher has given you. This will &quot;enrol&quot; you in the
- course.
- <LI>You can now access the full course. From now on you will only need
- to enter your personal username and password (in the form on this page)
- to log in and access any course you have enrolled in.
+$string['loginsteps'] = 'Hi! For full access to courses you\'ll need to take
+ a minute to create a new account for yourself on this web site.
+ Each of the individual courses may also have a one-time
+ &quot;enrolment key&quot;, which you won\'t need until later. Here are
+ the steps:
+ <OL size=2>
+ <LI>Fill out the <A HREF=$a>New Account</A> form with your details.
+ <LI>An email will be immediately sent to your email address.
+ <LI>Read your email, and click on the web link it contains.
+ <LI>Your account will be confirmed and you will be logged in.
+ <LI>Now, select the course you want to participate in.
+ <LI>If you are prompted for a &quot;enrolment key&quot; - use the one
+ that your teacher has given you. This will &quot;enrol&quot; you in the
+ course.
+ <LI>You can now access the full course. From now on you will only need
+ to enter your personal username and password (in the form on this page)
+ to log in and access any course you have enrolled in.
</OL>';
-$string['loginstepsnone'] = 'Hi!<P>For full access to courses you\'ll need to create
-yourself an account.<P>All you need to do is make up a username and password and use it in
-the form on this page!<P>If someone else has already chosen your username
+$string['loginstepsnone'] = 'Hi!<P>For full access to courses you\'ll need to create
+yourself an account.<P>All you need to do is make up a username and password and use it in
+the form on this page!<P>If someone else has already chosen your username
then you\'ll have to try again using a different username.';
$string['loginto'] = 'Login to $a';
$string['loginusing'] = 'Login here using your username and password';
@@ -561,25 +561,25 @@
$string['newaccount'] = 'New account';
$string['newcourse'] = 'New course';
$string['newpassword'] = 'New password';
-$string['newpasswordtext'] = 'Hi $a->firstname,
-
-Your account password at \'$a->sitename\' has been reset
-and you have been issued with a new temporary password.
-
-Your current login information is now:
- username: $a->username
- password: $a->newpassword
-
-Please go to this page to change your password:
- $a->link
-
-In most mail programs, this should appear as a blue link
-which you can just click on. If that doesn\'t work,
-then cut and paste the address into the address
-line at the top of your web browser window.
-
-Cheers from the \'$a->sitename\' administrator,
-$a->signoff
+$string['newpasswordtext'] = 'Hi $a->firstname,
+
+Your account password at \'$a->sitename\' has been reset
+and you have been issued with a new temporary password.
+
+Your current login information is now:
+ username: $a->username
+ password: $a->newpassword
+
+Please go to this page to change your password:
+ $a->link
+
+In most mail programs, this should appear as a blue link
+which you can just click on. If that doesn\'t work,
+then cut and paste the address into the address
+line at the top of your web browser window.
+
+Cheers from the \'$a->sitename\' administrator,
+$a->signoff
';
$string['newpicture'] = 'New picture';
$string['newsitem'] = 'news item';
@@ -641,9 +641,9 @@
$string['passwordrecovery'] = 'Yes, help me log in';
$string['passwordsdiffer'] = 'These passwords do not match';
$string['passwordsent'] = 'Password has been sent';
-$string['passwordsenttext'] = ' <P>An email has been sent to your address at $a->email.
- <P><B>Please check your email for your new password</B>
- <P>The new password was automatically generated, so you might like to
+$string['passwordsenttext'] = ' <P>An email has been sent to your address at $a->email.
+ <P><B>Please check your email for your new password</B>
+ <P>The new password was automatically generated, so you might like to
<A HREF=$a->link>change it to something easier to remember</A>.';
$string['people'] = 'People';
$string['personalprofile'] = 'Personal profile';
@@ -669,13 +669,13 @@
$string['recentactivity'] = 'Recent activity';
$string['registration'] = 'Moodle Registration';
$string['registrationemail'] = 'Email notifications';
-$string['registrationinfo'] = '<p>This page allows you to register your Moodle site with moodle.org. Registration is free.
-The main benefit of registering is that you will be added to a low-volume mailing list
-for important notifications such as security alerts and new releases of Moodle.
-<p>By default, your information will be kept private, and will never be sold or passed on to anyone else. The only
- reason for collecting this information is for support purposes, and to help build up a statistical
- picture of the Moodle community as a whole.
-<p>If you choose, you can allow your site name, country and URL to be added to the public list of Moodle Sites.
+$string['registrationinfo'] = '<p>This page allows you to register your Moodle site with moodle.org. Registration is free.
+The main benefit of registering is that you will be added to a low-volume mailing list
+for important notifications such as security alerts and new releases of Moodle.
+<p>By default, your information will be kept private, and will never be sold or passed on to anyone else. The only
+ reason for collecting this information is for support purposes, and to help build up a statistical
+ picture of the Moodle community as a whole.
+<p>If you choose, you can allow your site name, country and URL to be added to the public list of Moodle Sites.
<p>All new registrations are verified manually before they are added to the list, but once you are added you can update your registration (and your entry on the public list) at any time by resubmitting this form.';
$string['registrationno'] = 'No, I do not want to receive email';
$string['registrationsend'] = 'Send registration information to moodle.org';
@@ -847,11 +847,11 @@
$string['weeklyoutline'] = 'Weekly outline';
$string['weekshow'] = 'Show this week to $a';
$string['welcometocourse'] = 'Welcome to $a';
-$string['welcometocoursetext'] = 'Welcome to $a->coursename!
-
-If you have not done so already, you should edit your profile page
-within the course so that we can learn more about you:
-
+$string['welcometocoursetext'] = 'Welcome to $a->coursename!
+
+If you have not done so already, you should edit your profile page
+within the course so that we can learn more about you:
+
$a->profileurl';
$string['whattocallzip'] = 'What do you want to call the zip file?';
$string['withchosenfiles'] = 'With chosen files';

0 comments on commit 09b78a6

Please sign in to comment.
Something went wrong with that request. Please try again.