Index: mod/assignment/lang/en/assignment.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/lang/en/assignment.php,v
retrieving revision 1.12
diff -u -r1.12 assignment.php
--- mod/assignment/lang/en/assignment.php	28 Jun 2010 02:38:53 -0000	1.12
+++ mod/assignment/lang/en/assignment.php	5 Jul 2010 03:58:29 -0000
@@ -131,9 +131,9 @@
 $string['maximumgrade'] = 'Maximum grade';
 $string['maximumsize'] = 'Maximum size';
 $string['maxpublishstate'] = 'Maximum visibility for blog entry before due date';
-$string['modulename'] = 'Assignment';
-$string['modulename_help'] = 'Assignments enable the teacher to specify a task either on or offline which can then be graded.';
-$string['modulenameplural'] = 'Assignments';
+$string['pluginname'] = 'Assignment';
+$string['pluginname_help'] = 'Assignments enable the teacher to specify a task either on or offline which can then be graded.';
+$string['pluginnameplural'] = 'Assignments';
 $string['newsubmissions'] = 'Assignments submitted';
 $string['noassignments'] = 'There are no assignments yet';
 $string['noattempts'] = 'No attempts have been made on this assignment';
Index: mod/chat/lang/en/chat.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/chat/lang/en/chat.php,v
retrieving revision 1.5
diff -u -r1.5 chat.php
--- mod/chat/lang/en/chat.php	20 May 2010 06:26:41 -0000	1.5
+++ mod/chat/lang/en/chat.php	5 Jul 2010 03:58:29 -0000
@@ -74,10 +74,10 @@
 $string['methoddaemon'] = 'Chat server daemon';
 $string['methodnormal'] = 'Normal method';
 $string['methodajax'] = 'Ajax method';
-$string['modulename'] = 'Chat';
-$string['modulename_help'] = 'The chat module allows participants to have a real-time synchronous discussion via the web.  This is a useful way to get a different understanding of each other and the topic being discussed - the mode
+$string['pluginname'] = 'Chat';
+$string['pluginname_help'] = 'The chat module allows participants to have a real-time synchronous discussion via the web.  This is a useful way to get a different understanding of each other and the topic being discussed - the mode
 of using a chat room is quite different from the asynchronous forums.';
-$string['modulenameplural'] = 'Chats';
+$string['pluginnameplural'] = 'Chats';
 $string['neverdeletemessages'] = 'Never delete messages';
 $string['nextsession'] = 'Next scheduled session';
 $string['no_complete_sessions_found'] = 'No complete sessions found.';
Index: mod/choice/lang/en/choice.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/choice/lang/en/choice.php,v
retrieving revision 1.5
diff -u -r1.5 choice.php
--- mod/choice/lang/en/choice.php	30 Apr 2010 13:46:11 -0000	1.5
+++ mod/choice/lang/en/choice.php	5 Jul 2010 03:58:29 -0000
@@ -54,9 +54,9 @@
 $string['choicetext'] = 'Choice text';
 $string['limit'] = 'Limit';
 $string['limitanswers'] = 'Limit the number of responses allowed';
-$string['modulename'] = 'Choice';
-$string['modulename_help'] = 'The choice module enables the teacher to ask a question and specify a choice of multiple responses.';
-$string['modulenameplural'] = 'Choices';
+$string['pluginname'] = 'Choice';
+$string['pluginname_help'] = 'The choice module enables the teacher to ask a question and specify a choice of multiple responses.';
+$string['pluginnameplural'] = 'Choices';
 $string['mustchooseone'] = 'You must choose an answer before saving.  Nothing was saved.';
 $string['noguestchoose'] = 'Sorry, guests are not allowed to make choices.';
 $string['noresultsviewable'] = 'The results are not currently viewable.';
Index: mod/data/lang/en/data.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/data/lang/en/data.php,v
retrieving revision 1.17
diff -u -r1.17 data.php
--- mod/data/lang/en/data.php	2 May 2010 18:01:19 -0000	1.17
+++ mod/data/lang/en/data.php	5 Jul 2010 03:58:30 -0000
@@ -204,9 +204,9 @@
 $string['menuchoose'] = 'Choose...';
 $string['missingdata'] = 'Data id or object must be provided to field class';
 $string['missingfield'] = 'Programmer error: You must specify field and/or data when defining field class.';
-$string['modulename'] = 'Database';
-$string['modulename_help'] = 'The database activity module enables participants to create, maintain and search a bank of record entries. The format and structure of these entries can be almost unlimited, including images, files, URLs, numbers and text amongst other things.';
-$string['modulenameplural'] = 'Databases';
+$string['pluginname'] = 'Database';
+$string['pluginname_help'] = 'The database activity module enables participants to create, maintain and search a bank of record entries. The format and structure of these entries can be almost unlimited, including images, files, URLs, numbers and text amongst other things.';
+$string['pluginnameplural'] = 'Databases';
 $string['more'] = 'More';
 $string['moreurl'] = 'More URL';
 $string['movezipfailed'] = 'Can\'t move zip';
Index: mod/feedback/lang/en/feedback.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/feedback/lang/en/feedback.php,v
retrieving revision 1.13
diff -u -r1.13 feedback.php
--- mod/feedback/lang/en/feedback.php	4 Jun 2010 21:12:36 -0000	1.13
+++ mod/feedback/lang/en/feedback.php	5 Jul 2010 03:58:30 -0000
@@ -163,9 +163,9 @@
 $string['max_args_exceeded'] = 'Max 6 arguments can be handled, too many arguments for';
 $string['maximal'] = 'maximal';
 $string['mode'] = 'Mode';
-$string['modulename'] = 'Feedback';
-$string['modulename_help'] = 'The feedback modules enables custom surveys to be created.';
-$string['modulenameplural'] = 'Feedback';
+$string['pluginname'] = 'Feedback';
+$string['pluginname_help'] = 'The feedback modules enables custom surveys to be created.';
+$string['pluginnameplural'] = 'Feedback';
 $string['movedown_item'] = 'Move this question down';
 $string['move_here'] = 'Move here';
 $string['move_item'] = 'Move this question';
Index: mod/folder/lang/en/folder.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/folder/lang/en/folder.php,v
retrieving revision 1.2
diff -u -r1.2 folder.php
--- mod/folder/lang/en/folder.php	10 Apr 2010 14:01:53 -0000	1.2
+++ mod/folder/lang/en/folder.php	5 Jul 2010 03:58:30 -0000
@@ -26,6 +26,7 @@
 $string['contentheader'] = 'Content';
 $string['folderadministration'] = 'Folder administration';
 $string['foldercontent'] = 'Files and subfolders';
-$string['modulename'] = 'Folder';
-$string['modulenameplural'] = 'Folders';
+$string['pluginname'] = 'Folder';
+$string['pluginname_help'] = 'The folder activity provides a place for storing a set of files, optionally organised into sub-folders. You can change permissions to allow different roles to add files to the folder.';
+$string['pluginnameplural'] = 'Folders';
 $string['neverseen'] = 'Never seen';
Index: mod/forum/lang/en/forum.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/lang/en/forum.php,v
retrieving revision 1.12
diff -u -r1.12 forum.php
--- mod/forum/lang/en/forum.php	2 Jul 2010 03:26:55 -0000	1.12
+++ mod/forum/lang/en/forum.php	5 Jul 2010 03:58:30 -0000
@@ -246,10 +246,10 @@
 $string['modeflatoldestfirst'] = 'Display replies flat, with oldest first';
 $string['modenested'] = 'Display replies in nested form';
 $string['modethreaded'] = 'Display replies in threaded form';
-$string['modulename'] = 'Forum';
-$string['modulename_help'] = 'The forum module enables participants to have asynchronous discussions.';
-$string['modulename_link'] = 'forum';
-$string['modulenameplural'] = 'Forums';
+$string['pluginname'] = 'Forum';
+$string['pluginname_help'] = 'The forum module enables participants to have asynchronous discussions.';
+$string['pluginname_link'] = 'forum';
+$string['pluginnameplural'] = 'Forums';
 $string['more'] = 'more';
 $string['movedmarker'] = '(Moved)';
 $string['movethisdiscussionto'] = 'Move this discussion to ...';
Index: mod/glossary/lang/en/glossary.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/lang/en/glossary.php,v
retrieving revision 1.8
diff -u -r1.8 glossary.php
--- mod/glossary/lang/en/glossary.php	3 May 2010 16:49:07 -0000	1.8
+++ mod/glossary/lang/en/glossary.php	5 Jul 2010 03:58:30 -0000
@@ -200,9 +200,9 @@
 $string['linking'] = 'Auto-linking';
 $string['mainglossary'] = 'Main glossary';
 $string['maxtimehaspassed'] = 'Sorry, but the maximum time for editing this comment ({$a}) has passed!';
-$string['modulename'] = 'Glossary';
-$string['modulename_help'] = 'The glossary module enables participants to create and maintain a list of definitions, like a dictionary. Glossary entries may be automatically linked wherever the concept words and phrases appear throughout the course.';
-$string['modulenameplural'] = 'Glossaries';
+$string['pluginname'] = 'Glossary';
+$string['pluginname_help'] = 'The glossary module enables participants to create and maintain a list of definitions, like a dictionary. Glossary entries may be automatically linked wherever the concept words and phrases appear throughout the course.';
+$string['pluginnameplural'] = 'Glossaries';
 $string['newentries'] = 'New glossary entries';
 $string['newglossary'] = 'New glossary';
 $string['newglossarycreated'] = 'New glossary created.';
Index: mod/hotpot/lang/en/hotpot.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lang/en/hotpot.php,v
retrieving revision 1.3
diff -u -r1.3 hotpot.php
--- mod/hotpot/lang/en/hotpot.php	27 May 2010 13:21:13 -0000	1.3
+++ mod/hotpot/lang/en/hotpot.php	5 Jul 2010 03:58:30 -0000
@@ -90,10 +90,10 @@
 $string['location'] = 'File location';
 $string['maxgrade'] = 'Maximum grade';
 $string['maxgrade_help'] = 'This setting specifies the grade that all scores are scaled to. For example, if the quiz is worth 20% of the whole course, the maximum grade would be set to 20.';
-$string['modulename'] = 'Hot Potatoes Quiz';
-$string['modulename_help'] = 'The HotPot module enables the teacher to include Hot Potatoes quizzes in the course. Each attempt is automatically marked, and reports are available which show how individual questions were answered and some statistical trends in the scores.';
-$string['modulename_link'] = 'hotpot';
-$string['modulenameplural'] = 'Hot Potatoes Quizzes';
+$string['pluginname'] = 'Hot Potatoes Quiz';
+$string['pluginname_help'] = 'The HotPot module enables the teacher to include Hot Potatoes quizzes in the course. Each attempt is automatically marked, and reports are available which show how individual questions were answered and some statistical trends in the scores.';
+$string['pluginname_link'] = 'hotpot';
+$string['pluginnameplural'] = 'Hot Potatoes Quizzes';
 $string['navigation'] = 'Navigation';
 $string['navigation_help'] = 'This setting determines the navigation used in the quiz:
 
Index: mod/imscp/lang/en/imscp.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/imscp/lang/en/imscp.php,v
retrieving revision 1.3
diff -u -r1.3 imscp.php
--- mod/imscp/lang/en/imscp.php	27 Apr 2010 14:39:45 -0000	1.3
+++ mod/imscp/lang/en/imscp.php	5 Jul 2010 03:58:30 -0000
@@ -30,9 +30,9 @@
 $string['imscpadministration'] = 'IMSCP Administration';
 $string['keepold'] = 'Archive packages';
 $string['keepoldexplain'] = 'How many packages should be archived?';
-$string['modulename'] = 'IMS content package';
-$string['modulename_help'] = 'An IMS content package allows for packages created according to the IMS Content Packaging specification to be displayed in the course.';
-$string['modulenameplural'] = 'IMS content packages';
+$string['pluginname'] = 'IMS content package';
+$string['pluginname_help'] = 'An IMS content package allows for packages created according to the IMS Content Packaging specification to be displayed in the course.';
+$string['pluginnameplural'] = 'IMS content packages';
 $string['navigation'] = 'Navigation';
 $string['packagefile'] = 'Package file';
 $string['toc'] = 'TOC';
Index: mod/label/lang/en/label.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/label/lang/en/label.php,v
retrieving revision 1.3
diff -u -r1.3 label.php
--- mod/label/lang/en/label.php	27 Apr 2010 14:32:09 -0000	1.3
+++ mod/label/lang/en/label.php	5 Jul 2010 03:58:30 -0000
@@ -24,6 +24,6 @@
  */
 
 $string['labeltext'] = 'Label text';
-$string['modulename'] = 'Label';
-$string['modulename_help'] = 'A label enables text and images to be inserted among the activity links on the course page.';
-$string['modulenameplural'] = 'Labels';
+$string['pluginname'] = 'Label';
+$string['pluginname_help'] = 'A label enables text and images to be inserted among the activity links on the course page.';
+$string['pluginnameplural'] = 'Labels';
Index: mod/lesson/lang/en/lesson.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/lang/en/lesson.php,v
retrieving revision 1.9
diff -u -r1.9 lesson.php
--- mod/lesson/lang/en/lesson.php	3 May 2010 16:49:07 -0000	1.9
+++ mod/lesson/lang/en/lesson.php	5 Jul 2010 03:58:31 -0000
@@ -250,9 +250,9 @@
 $string['modattempts'] = 'Allow student review';
 $string['modattempts_help'] = 'If enabled, students can navigate through the lesson again from the start.';
 $string['modattemptsnoteacher'] = 'Student review only works for students.';
-$string['modulename'] = 'Lesson';
-$string['modulename_help'] = 'The lesson module enables the teacher to create an adaptive learning experience consisting of a series of pages containing questions.';
-$string['modulenameplural'] = 'Lessons';
+$string['pluginname'] = 'Lesson';
+$string['pluginname_help'] = 'The lesson module enables the teacher to create an adaptive learning experience consisting of a series of pages containing questions.';
+$string['pluginnameplural'] = 'Lessons';
 $string['move'] = 'Move page';
 $string['movedpage'] = 'Moved page';
 $string['movepagehere'] = 'Move page to here';
Index: mod/page/lang/en/page.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/page/lang/en/page.php,v
retrieving revision 1.6
diff -u -r1.6 page.php
--- mod/page/lang/en/page.php	22 May 2010 13:54:41 -0000	1.6
+++ mod/page/lang/en/page.php	5 Jul 2010 03:58:31 -0000
@@ -32,9 +32,9 @@
 $string['legacyfiles'] = 'Migration of old course file';
 $string['legacyfilesactive'] = 'Active';
 $string['legacyfilesdone'] = 'Finished';
-$string['modulename'] = 'Page';
-$string['modulename_help'] = 'A page enables a web page to be displayed and edited within the course.';
-$string['modulenameplural'] = 'Pages';
+$string['pluginname'] = 'Page';
+$string['pluginname_help'] = 'A page enables a web page to be displayed and edited within the course.';
+$string['pluginnameplural'] = 'Pages';
 $string['optionsheader'] = 'Options';
 $string['pageadministration'] = 'Page administration';
 $string['popupheight'] = 'Popup height (in pixels)';
Index: mod/quiz/lang/en/quiz.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/lang/en/quiz.php,v
retrieving revision 1.27
diff -u -r1.27 quiz.php
--- mod/quiz/lang/en/quiz.php	3 Jun 2010 11:04:42 -0000	1.27
+++ mod/quiz/lang/en/quiz.php	5 Jul 2010 03:58:31 -0000
@@ -476,9 +476,9 @@
 $string['missingquestion'] = 'Missing question label after line {$a}';
 $string['missingquestiontext'] = 'Missing question text';
 $string['missingword'] = 'Missing word format';
-$string['modulename'] = 'Quiz';
-$string['modulename_help'] = 'The quiz module enables the teacher to design and set quizzes consisting of multiple choice, true-false, matching and other question types. Each attempt is automatically marked, and the teacher can choose whether to give feedback and/or show correct answers.';
-$string['modulenameplural'] = 'Quizzes';
+$string['pluginname'] = 'Quiz';
+$string['pluginname_help'] = 'The quiz module enables the teacher to design and set quizzes consisting of multiple choice, true-false, matching and other question types. Each attempt is automatically marked, and the teacher can choose whether to give feedback and/or show correct answers.';
+$string['pluginnameplural'] = 'Quizzes';
 $string['moveselectedonpage'] = 'Move selected questions to page: {$a}';
 $string['moveto'] = 'Move to >>';
 $string['multianswer'] = 'Embedded Answers (Cloze)';
Index: mod/resource/lang/en/resource.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/resource/lang/en/resource.php,v
retrieving revision 1.7
diff -u -r1.7 resource.php
--- mod/resource/lang/en/resource.php	26 May 2010 07:09:02 -0000	1.7
+++ mod/resource/lang/en/resource.php	5 Jul 2010 03:58:32 -0000
@@ -52,8 +52,9 @@
 $string['legacyfiles'] = 'Migration of old course file';
 $string['legacyfilesactive'] = 'Active';
 $string['legacyfilesdone'] = 'Finished';
-$string['modulename'] = 'File';
-$string['modulenameplural'] = 'Files';
+$string['pluginname'] = 'File';
+$string['pluginname_help'] = 'You can publish a single file, or a file with supporting media (such as a html page with embedded images or videos).';
+$string['pluginnameplural'] = 'Files';
 $string['neverseen'] = 'Never seen';
 $string['notmigrated'] = 'This legacy resource type ({$a}) was not yet migrated, sorry.';
 $string['optionsheader'] = 'Options';
Index: mod/scorm/lang/en/scorm.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/scorm/lang/en/scorm.php,v
retrieving revision 1.19
diff -u -r1.19 scorm.php
--- mod/scorm/lang/en/scorm.php	5 Jul 2010 00:35:46 -0000	1.19
+++ mod/scorm/lang/en/scorm.php	5 Jul 2010 03:58:32 -0000
@@ -155,9 +155,9 @@
 $string['missingparam'] = 'A required is missing or wrong';
 $string['missing_tag'] = 'Missing tag {$a->tag}';
 $string['mode'] = 'Mode';
-$string['modulename'] = 'SCORM/AICC';
-$string['modulename_help'] = 'SCORM is a collection of specifications that enable interoperability, accessibility and reusability of web-based learning content. The SCORM/AICC module allows for SCORM/AICC packages to be included in the course.';
-$string['modulenameplural'] = 'SCORMs/AICCs';
+$string['pluginname'] = 'Learning package';
+$string['pluginname_help'] = 'SCORM and AICC are a collection of specifications that enable interoperability, accessibility and reusability of web-based learning content. The Learning packages module allows for SCORM and AICC packages to be included in the course.';
+$string['pluginnameplural'] = 'Learning packages';
 $string['newattempt'] = 'Start a new attempt';
 $string['next'] = 'Continue';
 $string['noactivity'] = 'Nothing to report';
Index: mod/survey/lang/en/survey.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/survey/lang/en/survey.php,v
retrieving revision 1.6
diff -u -r1.6 survey.php
--- mod/survey/lang/en/survey.php	28 Jun 2010 17:05:24 -0000	1.6
+++ mod/survey/lang/en/survey.php	5 Jul 2010 03:58:32 -0000
@@ -205,9 +205,9 @@
 $string['invalidsurveyid'] = 'Survey ID was incorrect';
 $string['invalidtmptid'] = 'Invalid template id';
 $string['ipreferthat'] = 'I prefer that';
-$string['modulename'] = 'Survey';
-$string['modulename_help'] = 'The survey module provides three types of survey instrument for assessing and stimulating learning in online environments. The teacher can use them to gather data that will help them learn about their class and reflect on their own teaching.';
-$string['modulenameplural'] = 'Surveys';
+$string['pluginname'] = 'Survey';
+$string['pluginname_help'] = 'The survey module provides three types of survey instrument for assessing and stimulating learning in online environments. The teacher can use them to gather data that will help them learn about their class and reflect on their own teaching.';
+$string['pluginnameplural'] = 'Surveys';
 $string['name'] = 'Name';
 $string['newsurveyresponses'] = 'New survey responses';
 $string['nobodyyet'] = 'Nobody has yet completed this survey';
Index: mod/url/lang/en/url.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/url/lang/en/url.php,v
retrieving revision 1.3
diff -u -r1.3 url.php
--- mod/url/lang/en/url.php	22 May 2010 13:54:41 -0000	1.3
+++ mod/url/lang/en/url.php	5 Jul 2010 03:58:32 -0000
@@ -35,8 +35,9 @@
 $string['externalurl'] = 'External URL';
 $string['framesize'] = 'Frame height';
 $string['chooseavariable'] = 'Choose a variable...';
-$string['modulename'] = 'URL';
-$string['modulenameplural'] = 'URLs';
+$string['pluginname'] = 'URL';
+$string['pluginname_help'] = 'Specify a URL pointing to any content on the web.';
+$string['pluginnameplural'] = 'URLs';
 $string['neverseen'] = 'Never seen';
 $string['optionsheader'] = 'Options';
 $string['parameterinfo'] = 'parameter=variable';
Index: mod/wiki/lang/en/wiki.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/lang/en/wiki.php,v
retrieving revision 1.6
diff -u -r1.6 wiki.php
--- mod/wiki/lang/en/wiki.php	9 Jun 2010 09:02:10 -0000	1.6
+++ mod/wiki/lang/en/wiki.php	5 Jul 2010 03:58:32 -0000
@@ -69,8 +69,9 @@
 $string['migrationfinishednowikis'] = 'Migration finished, no wikis were migrated';
 $string['missingpages'] = 'Pages without content';
 $string['modified'] = 'Modified';
-$string['modulename'] = 'Wiki';
-$string['modulenameplural'] = 'Wikis';
+$string['pluginname'] = 'Wiki';
+$string['pluginname_help'] = 'Wikis allow collaborative editing of web pages, with tools that make it easy to link between multiple pages.';
+$string['pluginnameplural'] = 'Wikis';
 $string['navigation'] = 'Navigation';
 $string['navigationfrom'] = 'This page comes from';
 $string['navigationto'] = 'This page goes to';
Index: mod/workshop/lang/en/workshop.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/workshop/lang/en/workshop.php,v
retrieving revision 1.17
diff -u -r1.17 workshop.php
--- mod/workshop/lang/en/workshop.php	20 Jun 2010 15:23:28 -0000	1.17
+++ mod/workshop/lang/en/workshop.php	5 Jul 2010 03:58:32 -0000
@@ -137,8 +137,9 @@
 $string['latesubmissions_help'] = 'If enabled, a student may submit their work after the submissions deadline or during the assessment phase. Late submissions cannot be edited though.';
 $string['maxbytes'] = 'Maximum file size';
 $string['messageclose'] = '(X)';
-$string['modulename'] = 'Workshop';
-$string['modulenameplural'] = 'Workshops';
+$string['pluginname'] = 'Workshop';
+$string['pluginname_help'] = 'A workshop is an activity that manages peer-assessment of assigments.';
+$string['pluginnameplural'] = 'Workshops';
 $string['mysubmission'] = 'My submission';
 $string['nattachments'] = 'Maximum number of submission attachments';
 $string['noexamples'] = 'No examples yet in this workshop';