Merge branch 'MDL-29164' of git://github.com/timhunt/moodle

diff --git a/lang/en/question.php b/lang/en/question.php
index c963b3e..947fbbc 100644 (file)
--- a/lang/en/question.php
+++ b/lang/en/question.php
@@ -219,6 +219,7 @@ $string['nocate'] = 'No such category {$a}!';
 $string['nopermissionadd'] = 'You don\'t have permission to add questions here.';
 $string['nopermissionmove'] = 'You don\'t have permission to move questions from here. You must save the question in this category or save it as a new question.';
 $string['noprobs'] = 'No problems found in your question database.';
+$string['noquestionsinfile'] = 'There are no questions in the import file';
 $string['notenoughanswers'] = 'This type of question requires at least {$a} answers';
 $string['notenoughdatatoeditaquestion'] = 'Neither a question id, nor a category id and question type, was specified.';
 $string['notenoughdatatomovequestions'] = 'You need to provide the question ids of questions you want to move.';

diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index c0683bd..df384ed 100644 (file)
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -435,7 +435,6 @@ $string['nopossibledatasets'] = 'No possible datasets';
 $string['noquestionintext'] = 'The question text does not contain any embedded questions';
 $string['noquestions'] = 'No questions have been added yet';
 $string['noquestionsfound'] = 'No questions found';
-$string['noquestionsinfile'] = 'There are no questions in the import file';
 $string['noquestionsinquiz'] = 'There are no questions in this quiz.';
 $string['noquestionsnotinuse'] = 'This random question is not in use, since its category is empty.';
 $string['noquestionsonpage'] = 'Empty page';