Merged some changes from HEAD

lang/en/auth.php

@@ -66,6 +66,7 @@ $string['auth_ldap_memberattribute'] = 'Optional: Overrides user member attribut
 $string['auth_ldap_objectclass'] = 'Optional: Overrides objectClass used to name/search users on ldap_user_type. Usually you dont need to chage this.';
 $string['auth_ldap_opt_deref'] = 'Determines how aliases are handled during search. Select one of the following values: \"No\" (LDAP_DEREF_NEVER) or \"Yes\" (LDAP_DEREF_ALWAYS) ';
 $string['auth_ldap_passwdexpire_settings'] = 'LDAP password expiration settings.';
+$string['auth_ldap_preventpassindb'] = 'Select yes to prevent passwords from being stored in Moodle\'s DB.';
 $string['auth_ldap_search_sub'] = 'Search users from subcontexts.';
 $string['auth_ldap_server_settings'] = 'LDAP server settings';
 $string['auth_ldap_update_userinfo'] = 'Update user information (firstname, lastname, address..) from LDAP to Moodle.  Specify \"Data mapping\" settings as you need.';

lang/en/enrol_authorize.php

@@ -1,5 +1,5 @@
 <?PHP // $Id$ 
-      // enrol_authorize.php - created with Moodle 1.5 Beta (2005052300)
+      // enrol_authorize.php - created with Moodle 1.5.1 (2005060210)
 
 
 $string['anlogin'] = 'Authorize.net: Login name';
@@ -12,11 +12,15 @@ $string['ccexpired'] = 'The credit card has expired';
 $string['ccinvalid'] = 'Invalid card number';
 $string['ccno'] = 'Credit Card Number';
 $string['cctype'] = 'Credit Card Type';
-$string['ccvv'] = 'CV2';
+$string['ccvv'] = 'Card Verification';
 $string['ccvvhelp'] = 'Look at the back of card (last 3 digits)';
+$string['choosemethod'] = 'If you know enrolment key of the cource, enter it; otherwise you need to paid for this course.';
 $string['chooseone'] = 'Fill one or both of the following two fields';
 $string['description'] = 'The Authorize.net module allows you to set up paid courses via CC providers.  If the cost for any course is zero, then students are not asked to pay for entry.  There is a site-wide cost that you set here as a default for the whole site and then a course setting that you can set for each course individually. The course cost overrides the site cost.';
 $string['enrolname'] = 'Authorize.net Credit Card Gateway';
+$string['logindesc'] = 'You can set up <a href=\"$a->url\">loginhttps</a> option in Variables/Security section.
+<br /><br />
+Turning this on will make Moodle use a secure https connection just for the login and payment page.';
 $string['nameoncard'] = 'Name on Card';
 $string['sendpaymentbutton'] = 'Send Payment';
 $string['zipcode'] = 'Zip Code';

lang/en/help/scorm/height.html

@@ -1,3 +0,0 @@
-<p><b>Height</b></p>
-
-<p>This setting define the SCO frame/window height.</p> 

lang/en/help/scorm/width.html

@@ -1,3 +0,0 @@
-<p><b>Width</b></p>
-
-<p>This setting define the SCO frame/window width.</p> 

lang/en/resource.php

@@ -85,6 +85,7 @@ $string['resourcetypedirectory'] = 'Display a directory';
 $string['resourcetypefile'] = 'Link to a file or web site';
 $string['resourcetypehtml'] = 'Compose a web page';
 $string['resourcetypelabel'] = 'Insert a label';
+$string['resourcetyperepository'] = 'Link to a repository object';
 $string['resourcetypetext'] = 'Compose a text page';
 $string['searchweb'] = 'Search for web page';
 $string['serverurl'] = 'Server URL ($a->wwwroot)';