diff --git a/lang/en/badges.php b/lang/en/badges.php index 8eeed52bb47..83ab4536840 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -392,6 +392,3 @@ $string['visible'] = 'Visible'; $string['warnexpired'] = ' (This badge has expired!)'; $string['year'] = 'Year(s)'; -// Deprecated since Moodle 2.8. - -$string['hidden'] = 'Hidden'; diff --git a/lang/en/calendar.php b/lang/en/calendar.php index 72154428caa..f60a5bf6719 100644 --- a/lang/en/calendar.php +++ b/lang/en/calendar.php @@ -216,6 +216,3 @@ $string['weekthis'] = 'This week'; $string['yesterday'] = 'Yesterday'; $string['youcandeleteallrepeats'] = 'This event is part of a repeating event series. You can delete this event only, or all {$a} events in the series at once.'; -// Deprecated since Moodle 2.8. - -$string['hidden'] = 'hidden'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index bdc0b105c13..83a6cb4feb9 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -1,12 +1,3 @@ -hidden,core_badges -hidden,core_calendar -hidden,core_portfolio -hidden,core_question -hidden,core_repository -hidden,core_role -simpleview,core_grades -fullview,core_grades -categoriesedit,core_grades lockingmeans,core_cache lockmethod,core_cache lockmethod_help,core_cache diff --git a/lang/en/grades.php b/lang/en/grades.php index 976d96209b4..a2336f5d943 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -759,9 +759,3 @@ $string['writinggradebookinfo'] = 'Writing gradebook settings'; $string['xml'] = 'XML'; $string['yes'] = 'Yes'; $string['yourgrade'] = 'Your grade'; - -// Deprecated since Moodle 2.8 - -$string['categoriesedit'] = 'Edit setup'; -$string['fullview'] = 'Full view'; -$string['simpleview'] = 'Simple view'; diff --git a/lang/en/portfolio.php b/lang/en/portfolio.php index b9f013fa2ee..8e1ea6b907f 100644 --- a/lang/en/portfolio.php +++ b/lang/en/portfolio.php @@ -180,6 +180,3 @@ $string['wait'] = 'Wait'; $string['wanttowait_high'] = 'It is not recommended that you wait for this transfer to complete, but you can if you\'re sure and know what you\'re doing'; $string['wanttowait_moderate'] = 'Do you want to wait for this transfer? It might take a few minutes'; -// Deprecated since Moodle 2.8. - -$string['hidden'] = 'Hidden'; diff --git a/lang/en/question.php b/lang/en/question.php index 10f7c99d2fb..126fb084406 100644 --- a/lang/en/question.php +++ b/lang/en/question.php @@ -443,6 +443,3 @@ $string['withselected'] = 'With selected'; $string['xoutofmax'] = '{$a->mark} out of {$a->max}'; $string['yougotnright'] = 'You have correctly selected {$a->num}.'; -// Deprecated since Moodle 2.8. - -$string['hidden'] = 'Hidden'; diff --git a/lang/en/repository.php b/lang/en/repository.php index 7291f807dbf..845f0998086 100644 --- a/lang/en/repository.php +++ b/lang/en/repository.php @@ -243,8 +243,5 @@ $string['wrongcontext'] = 'You cannot access to this context'; $string['xhtmlerror'] = 'You are probably using an XHTML strict header. Certain YUI components don\'t work in this mode; please turn it off.'; $string['ziped'] = 'Compress folder successfully'; -// Deprecated since Moodle 2.8. -$string['hidden'] = 'Hidden'; - // Deprecated since Moodle 2.9. $string['personalrepositories'] = 'Available repository instances'; diff --git a/lang/en/role.php b/lang/en/role.php index 57ef1c1103a..c3e2378be21 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -422,6 +422,3 @@ $string['whydoesusernothavecap'] = 'Why does {$a->fullname} not have capability $string['xroleassignments'] = '{$a}\'s role assignments'; $string['xuserswiththerole'] = 'Users with the role "{$a->role}"'; -// Deprecated since Moodle 2.8. - -$string['hidden'] = 'Hidden'; diff --git a/mod/quiz/lang/en/deprecated.txt b/mod/quiz/lang/en/deprecated.txt index 8162c480c32..b983d16e3cc 100644 --- a/mod/quiz/lang/en/deprecated.txt +++ b/mod/quiz/lang/en/deprecated.txt @@ -1,10 +1,2 @@ -categories,mod_quiz -category,mod_quiz -export,mod_quiz -import,mod_quiz -invalidnumericanswer,mod_quiz -invalidnumerictolerance,mod_quiz -multiplier,mod_quiz timelimitmin,mod_quiz timelimitsec,mod_quiz -unusedcategorydeleted,mod_quiz diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index df0c5ef6b3e..798d097ba4e 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -888,8 +888,6 @@ $string['timelimit'] = 'Time limit'; $string['timelimit_help'] = 'If enabled, the time limit is stated on the initial quiz page and a countdown timer is displayed in the quiz navigation block.'; $string['timelimit_link'] = 'mod/quiz/timing'; $string['timelimitexeeded'] = 'Sorry! Quiz time limit exceeded!'; -$string['timelimitmin'] = 'Time limit (minutes)'; -$string['timelimitsec'] = 'Time limit (seconds)'; $string['timestr'] = '%H:%M:%S on %d/%m/%y'; $string['timesup'] = 'Time is up!'; $string['timetaken'] = 'Time taken'; @@ -933,13 +931,7 @@ $string['xhtml'] = 'XHTML'; $string['youneedtoenrol'] = 'You need to enrol in this course before you can attempt this quiz'; $string['yourfinalgradeis'] = 'Your final grade for this quiz is {$a}.'; -// Deprecated since Moodle 2.8. +// Deprecated since Moodle 2.9. -$string['categories'] = 'Categories'; -$string['category'] = 'Category'; -$string['export'] = 'Export'; -$string['import'] = 'Import'; -$string['invalidnumericanswer'] = 'One of the answers you entered was not a valid number.'; -$string['invalidnumerictolerance'] = 'One of the tolerances you entered was not a valid number.'; -$string['multiplier'] = 'Multiplier'; -$string['unusedcategorydeleted'] = 'This category has been deleted because, after deleting the course, its questions weren\'t used any more.'; +$string['timelimitmin'] = 'Time limit (minutes)'; +$string['timelimitsec'] = 'Time limit (seconds)';