chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

Browse Source
skala
Yannick Warnier 13 years ago
parent 4701d5b010 14121f27ea
commit 3f3acff1fb
3 changed files with 2 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/lang/english/install.inc.php
  2. 1
      main/lang/english/trad4all.inc.php
  3. 3
      tests/run.php

2
main/lang/english/install.inc.php
Unescape View File

@ -133,4 +133,4 @@ $CourseTestWasCreated = "A test course has been created successfully";
$InstallExecution = "Installation process execution"; $InstallExecution = "Installation process execution";
$UpdateExecution = "Update process execution"; $UpdateExecution = "Update process execution";
$PleaseWaitThisCouldTakeAWhile = "Please wait. This could take a while..."; $PleaseWaitThisCouldTakeAWhile = "Please wait. This could take a while...";
?> ?>

1
main/lang/english/trad4all.inc.php
Unescape View File

@ -1255,4 +1255,5 @@ $Go = "Go";
$ImportThematic = "Import course progress"; $ImportThematic = "Import course progress";
$ExportThematic = "Export course progress"; $ExportThematic = "Export course progress";
$DeleteAllThematic = "Delete all course progress"; $DeleteAllThematic = "Delete all course progress";
$ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation = "This platform was unable to send the email. Please contact %s for more information.";
?> ?>

3
tests/run.php
Unescape View File

@ -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
Write Preview
Loading…
Cancel
Save