merge

13 years ago · 3f3acff1fb
parent 4701d5b010 14121f27ea
commit 3f3acff1fb
3 changed files with 2 additions and 4 deletions
--- a/main/lang/english/install.inc.php
+++ b/main/lang/english/install.inc.php
@ -133,4 +133,4 @@ $CourseTestWasCreated = "A test course has been created successfully";
 $InstallExecution = "Installation process execution";
 $UpdateExecution = "Update process execution";
 $PleaseWaitThisCouldTakeAWhile = "Please wait. This could take a while...";
-?>
+?>
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@ -1255,4 +1255,5 @@ $Go = "Go";
 $ImportThematic = "Import course progress";
 $ExportThematic = "Export course progress";
 $DeleteAllThematic = "Delete all course progress";
+$ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation = "This platform was unable to send the email. Please contact %s for more information.";
 ?>
--- a/tests/run.php
+++ b/tests/run.php
@ -1,3 +0,0 @@
-#!/bin/bash
-php5 test_suite.php > log/results.xml
-xsltproc simpletest_to_junit.xsl log/results.xml > log/results-1.xml