diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index c7b255937e6..06ce696e416 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -5,24 +5,8 @@ myfilesmanage,core mypreferences,core_grades myprofile,core viewallmyentries,core_blog -taggedwith,core_tag -officialtag,core_tag -otags,core_tag -othertags,core_tag -tagtype,core_tag -manageofficialtags,core_tag -settypeofficial,core_tag -filetoolarge,core -maxbytesforfile,core modchooserenable,core modchooserdisable,core -maxbytes,core_error -downloadcsv,core_table -downloadexcel,core_table -downloadods,core_table -downloadoptions,core_table -downloadtsv,core_table -downloadxhtml,core_table invalidpersistent,core_competency revealpassword,core_form mediasettings,core_media diff --git a/lang/en/error.php b/lang/en/error.php index 55786b47df4..492de6fd62f 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -593,5 +593,3 @@ $string['alreadyloggedin'] = 'You are already logged in as {$a}, you need to log $string['youcannotdeletecategory'] = 'You cannot delete category \'{$a}\' because you can neither delete the contents, nor move them elsewhere.'; $string['protected_cc_not_supported'] = 'Protected cartridges not supported.'; -// Deprecated since Moodle 3.1. -$string['maxbytes'] = 'The file is larger than the maximum size allowed.'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 7df89eb5cc3..80b20b6611e 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -2150,10 +2150,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\''; $string['zippingbackup'] = 'Zipping backup'; $string['deprecatedeventname'] = '{$a} (no longer in use)'; -// Deprecated since Moodle 3.1. -$string['filetoolarge'] = 'is too large to upload'; -$string['maxbytesforfile'] = 'The file {$a} is larger than the maximum size allowed.'; - // Deprecated since Moodle 3.2. $string['modchooserenable'] = 'Activity chooser on'; $string['modchooserdisable'] = 'Activity chooser off'; diff --git a/lang/en/table.php b/lang/en/table.php index 8ab01a3e29e..78020e0b15e 100644 --- a/lang/en/table.php +++ b/lang/en/table.php @@ -24,10 +24,3 @@ $string['downloadas'] = 'Download table data as'; -// Deprecated since Moodle 3.1. -$string['downloadcsv'] = 'Comma separated values text file'; -$string['downloadexcel'] = 'Excel spreadsheet'; -$string['downloadods'] = 'OpenDocument spreadsheet'; -$string['downloadoptions'] = 'Select download options'; -$string['downloadtsv'] = 'Tab separated values text file'; -$string['downloadxhtml'] = 'Unpaged XHTML document'; diff --git a/lang/en/tag.php b/lang/en/tag.php index 83d3b5f7ee0..fea1031a671 100644 --- a/lang/en/tag.php +++ b/lang/en/tag.php @@ -148,12 +148,3 @@ $string['page-tag-index'] = 'Single tag page'; $string['page-tag-search'] = 'Tag search page'; $string['page-tag-manage'] = 'Manage tags page'; -// Deprecated since 3.1 . - -$string['manageofficialtags'] = 'Manage official tags'; -$string['officialtag'] = 'Official'; -$string['otags'] = 'Official tags'; -$string['othertags'] = 'Other tags'; -$string['settypeofficial'] = 'Make official'; -$string['taggedwith'] = 'tagged with "{$a}"'; -$string['tagtype'] = 'Tag type'; diff --git a/mod/feedback/lang/en/deprecated.txt b/mod/feedback/lang/en/deprecated.txt index 176f3040936..fe76fa7af92 100644 --- a/mod/feedback/lang/en/deprecated.txt +++ b/mod/feedback/lang/en/deprecated.txt @@ -1,28 +1,2 @@ -cancel_moving,mod_feedback -cannotunmap,mod_feedback -cannotmapfeedback,mod_feedback -line_values,mod_feedback -mapcourses_help,mod_feedback -max_args_exceeded,mod_feedback -movedown_item,mod_feedback -move_here,mod_feedback -moveup_item,mod_feedback -notavailable,mod_feedback -parameters_missing,mod_feedback -picture,mod_feedback -picture_file_list,mod_feedback -picture_values,mod_feedback -preview,mod_feedback -preview_help,mod_feedback -radiorated,mod_feedback -radiobutton,mod_feedback -radiobutton_rated,mod_feedback -relateditemsdeleted,mod_feedback -separator_decimal,mod_feedback -separator_thousand,mod_feedback -saving_failed_because_missing_or_false_values,mod_feedback start,mod_feedback -stop,mod_feedback -switch_group,mod_feedback -viewcompleted,mod_feedback -viewcompleted_help,mod_feedback +stop,mod_feedback \ No newline at end of file diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php index 73eb880f931..a0ee5f114ea 100644 --- a/mod/feedback/lang/en/feedback.php +++ b/mod/feedback/lang/en/feedback.php @@ -275,35 +275,6 @@ $string['use_one_line_for_each_value'] = 'Use one line for each answer!'; $string['use_this_template'] = 'Use this template'; $string['using_templates'] = 'Use a template'; $string['vertical'] = 'vertical'; -// Deprecated since Moodle 3.1. -$string['cannotmapfeedback'] = 'Database problem, unable to map feedback to course'; -$string['line_values'] = 'Rating'; -$string['mapcourses_help'] = 'Once you have selected the relevant course(s) from your search, -you can associate them with this feedback using map course(s). Multiple courses may be selected by holding down the Apple or Ctrl key whilst clicking on the course names. A course may be disassociated from a feedback at any time.'; -$string['max_args_exceeded'] = 'Max 6 arguments can be handled, too many arguments for'; -$string['cancel_moving'] = 'Cancel moving'; -$string['movedown_item'] = 'Move this question down'; -$string['move_here'] = 'Move here'; -$string['moveup_item'] = 'Move this question up'; -$string['notavailable'] = 'this feedback is not available'; -$string['saving_failed_because_missing_or_false_values'] = 'Saving failed because missing or false values'; -$string['cannotunmap'] = 'Database problem, unable to unmap'; -$string['viewcompleted'] = 'completed feedbacks'; -$string['viewcompleted_help'] = 'You may view completed feedback forms, searchable by course and/or by question. -Feedback responses may be exported to Excel.'; -$string['parameters_missing'] = 'Parameters missing from'; -$string['picture'] = 'Picture'; -$string['picture_file_list'] = 'List of pictures'; -$string['picture_values'] = 'Choose one or more
picture files from the list:'; -$string['preview'] = 'Preview'; -$string['preview_help'] = 'In the preview you can change the order of questions.'; -$string['switch_group'] = 'Switch group'; -$string['separator_decimal'] = '.'; -$string['separator_thousand'] = ','; -$string['relateditemsdeleted'] = 'All responses for this question will also be deleted.'; -$string['radiorated'] = 'Radiobutton (rated)'; -$string['radiobutton'] = 'Multiple choice - single answer allowed (radio buttons)'; -$string['radiobutton_rated'] = 'Radiobutton (rated)'; // Deprecated since Moodle 3.2. $string['start'] = 'Start'; $string['stop'] = 'End'; diff --git a/mod/forum/lang/en/deprecated.txt b/mod/forum/lang/en/deprecated.txt deleted file mode 100644 index caf084cb798..00000000000 --- a/mod/forum/lang/en/deprecated.txt +++ /dev/null @@ -1,6 +0,0 @@ -postmailinfo,mod_forum -emaildigestupdated,mod_forum -emaildigestupdated_default,mod_forum -emaildigest_0,mod_forum -emaildigest_1,mod_forum -emaildigest_2,mod_forum diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 9ee8be19bb8..abb841078e6 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -555,13 +555,3 @@ $string['warnformorepost'] = 'Warning! There is more than one discussion in this $string['yournewquestion'] = 'Your new question'; $string['yournewtopic'] = 'Your new discussion topic'; $string['yourreply'] = 'Your reply'; - -// Deprecated since Moodle 3.1. -$string['postmailinfo'] = 'This is a copy of a message posted on the {$a} website. - -To reply click on this link:'; -$string['emaildigestupdated'] = 'The e-mail digest option was changed to \'{$a->maildigesttitle}\' for the forum \'{$a->forum}\'. {$a->maildigestdescription}'; -$string['emaildigestupdated_default'] = 'Your default profile setting of \'{$a->maildigesttitle}\' was used for the forum \'{$a->forum}\'. {$a->maildigestdescription}.'; -$string['emaildigest_0'] = 'You will receive one e-mail per forum post.'; -$string['emaildigest_1'] = 'You will receive one digest e-mail per day containing the complete contents of each forum post.'; -$string['emaildigest_2'] = 'You will receive one digest e-mail per day containing the subject of each forum post.'; diff --git a/mod/lesson/lang/en/deprecated.txt b/mod/lesson/lang/en/deprecated.txt deleted file mode 100644 index 7521da8cb82..00000000000 --- a/mod/lesson/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -configactionaftercorrectanswer,mod_lesson \ No newline at end of file diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php index a5cd95ff28e..52cf7865209 100644 --- a/mod/lesson/lang/en/lesson.php +++ b/mod/lesson/lang/en/lesson.php @@ -547,5 +547,3 @@ $string['yourcurrentgradeis'] = 'Your current grade is {$a}'; $string['yourcurrentgradeisoutof'] = 'Your current grade is {$a->grade} out of {$a->total}'; $string['youshouldview'] = 'You should answer at least: {$a}'; -// Deprecated since Moodle 3.1. -$string['configactionaftercorrectanswer'] = 'The default action to take after a correct answer'; diff --git a/mod/workshop/form/accumulative/lang/en/deprecated.txt b/mod/workshop/form/accumulative/lang/en/deprecated.txt deleted file mode 100644 index a7d55aacead..00000000000 --- a/mod/workshop/form/accumulative/lang/en/deprecated.txt +++ /dev/null @@ -1,2 +0,0 @@ -dimensioncomment,workshopform_accumulative -dimensiongrade,workshopform_accumulative diff --git a/mod/workshop/form/accumulative/lang/en/workshopform_accumulative.php b/mod/workshop/form/accumulative/lang/en/workshopform_accumulative.php index 31ab57f4314..43567c4c3d5 100644 --- a/mod/workshop/form/accumulative/lang/en/workshopform_accumulative.php +++ b/mod/workshop/form/accumulative/lang/en/workshopform_accumulative.php @@ -48,6 +48,3 @@ $string['scalename5'] = 'Excellent/Very poor (5 point)'; $string['scalename6'] = 'Excellent/Very poor (7 point)'; $string['verypoor'] = 'Very poor'; -// Deprecated since Moodle 3.1. -$string['dimensioncomment'] = 'Comment'; -$string['dimensiongrade'] = 'Grade'; diff --git a/mod/workshop/form/comments/lang/en/deprecated.txt b/mod/workshop/form/comments/lang/en/deprecated.txt deleted file mode 100644 index a680205c2fa..00000000000 --- a/mod/workshop/form/comments/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -dimensioncomment,workshopform_comments diff --git a/mod/workshop/form/comments/lang/en/workshopform_comments.php b/mod/workshop/form/comments/lang/en/workshopform_comments.php index fb11fbe7dc9..7677acd4779 100644 --- a/mod/workshop/form/comments/lang/en/workshopform_comments.php +++ b/mod/workshop/form/comments/lang/en/workshopform_comments.php @@ -29,5 +29,3 @@ $string['dimensiondescription'] = 'Description'; $string['dimensionnumber'] = 'Aspect {$a}'; $string['pluginname'] = 'Comments'; -// Deprecated since Moodle 3.1. -$string['dimensioncomment'] = 'Comment'; diff --git a/mod/workshop/form/numerrors/lang/en/deprecated.txt b/mod/workshop/form/numerrors/lang/en/deprecated.txt deleted file mode 100644 index c0783090c81..00000000000 --- a/mod/workshop/form/numerrors/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -dimensioncomment,workshopform_numerrors diff --git a/mod/workshop/form/numerrors/lang/en/workshopform_numerrors.php b/mod/workshop/form/numerrors/lang/en/workshopform_numerrors.php index 55fd5349852..307cfed9d87 100644 --- a/mod/workshop/form/numerrors/lang/en/workshopform_numerrors.php +++ b/mod/workshop/form/numerrors/lang/en/workshopform_numerrors.php @@ -41,5 +41,3 @@ $string['mapgrade'] = 'Grade for submission'; $string['percents'] = '{$a} %'; $string['pluginname'] = 'Number of errors'; -// Deprecated since Moodle 3.1. -$string['dimensioncomment'] = 'Comment'; diff --git a/mod/workshop/lang/en/deprecated.txt b/mod/workshop/lang/en/deprecated.txt index dc549a1c974..0be98a295c5 100644 --- a/mod/workshop/lang/en/deprecated.txt +++ b/mod/workshop/lang/en/deprecated.txt @@ -1,3 +1,2 @@ err_unknownfileextension,mod_workshop err_wrongfileextension,mod_workshop -yourassessment,mod_workshop diff --git a/mod/workshop/lang/en/workshop.php b/mod/workshop/lang/en/workshop.php index b09bb2a65d0..a7b383f3877 100644 --- a/mod/workshop/lang/en/workshop.php +++ b/mod/workshop/lang/en/workshop.php @@ -371,9 +371,6 @@ $string['yourassessmentfor'] = 'Your assessment for {$a}'; $string['yourgrades'] = 'Your grades'; $string['yoursubmission'] = 'Your submission'; -// Deprecated since Moodle 3.1. -$string['yourassessment'] = 'Your assessment'; - // Deprecated since Moodle 3.4. $string['err_unknownfileextension'] = 'Unknown file extension: {$a}'; $string['err_wrongfileextension'] = 'Some files ({$a->wrongfiles}) cannot be uploaded. Only file types {$a->whitelist} are allowed.';