Merge "View.php: Lang string fixes (Bug #1432523)"

htdocs/lang/en.utf8/view.php

@@ -167,13 +167,13 @@ $string['submitconfirm'] = 'If you submit \'%s\' to %s for assessment, you will
 $string['viewsubmitted'] = 'Page submitted';
 $string['collectionsubmitted'] = 'Collection submitted';
 $string['collectionviewsalreadysubmitted'] = "Some pages in this collection have already been submitted: \"%s\"\nYou cannot submit the collection until they have been released, or removed from the collection.";
-$string['viewalreadysubmitted'] = 'This page has already been submitted to another assignment or Mahara group.';
-$string['collectionalreadysubmitted'] = 'This collection has already been submitted to another assignment or Mahara group.';
+$string['viewalreadysubmitted'] = 'This page has already been submitted to another assignment or group.';
+$string['collectionalreadysubmitted'] = 'This collection has already been submitted to another assignment or group.';
 $string['collectionsubmissionexceptiontitle'] = 'Could not submit collection';
-$string['collectionsubmissionexceptionmessage'] = 'This collection can not be submitted, for the following reason:';
+$string['collectionsubmissionexceptionmessage'] = 'This collection cannot be submitted for the following reason:';
 $string['cantsubmitemptycollection'] = 'This collection does not contain any pages.';
 $string['viewsubmissionexceptiontitle'] = 'Could not submit page';
-$string['viewsubmissionexceptionmessage'] = 'This page can not be submitted, for the following reason:';
+$string['viewsubmissionexceptionmessage'] = 'This page cannot be submitted for the following reason:';
 $string['submitviewtogroup'] = 'Submit \'%s\' to \'%s\' for assessment';
 $string['cantsubmitviewtogroup'] = 'You cannot submit this page to this group for assessment.';
 $string['cantsubmitcollectiontogroup'] = 'You cannot submit this collection.';
@@ -183,7 +183,7 @@ $string['cantdeleteview'] = 'You cannot delete this page.';
 $string['deletespecifiedview'] = 'Delete page "%s"';
 $string['deleteviewconfirm1'] = 'Do you really want to delete this page? It cannot be undone.';
 $string['deleteviewconfirmbackup'] = 'Please consider creating a backup of this page by <a href="%sexport/" target="_blank">exporting</a> it.';
-$string['deleteviewconfirmnote1'] = '<strong>NOTE:</strong> All your files and journal entries that you linked in this page will still be available.<br/>However, any feedback placed on this page will be deleted.';
+$string['deleteviewconfirmnote1'] = '<strong>Note:</strong> All your files and journal entries that you linked in this page will still be available.<br/>However, any feedback placed on this page will be deleted.';
 $string['deleteviewconfirmnote2'] = 'This page is a part of the collection <a href="%s">"%s"</a>.';
 
 $string['editaccesspagedescription5'] = '<p>You are the only one who can see your pages and collections by default. On this page you decide who can access them besides you. Click the "Add" buttons next to the groups and people with whom you wish to share your pages.</p> <p>Click <a href="#" onclick=\'contextualHelp("","","core","view","editaccess","", $j("#main-column-container h1 .help a")[0]); return false;\'>help</a> for more detailed information.</p>';
@@ -373,7 +373,7 @@ $string['copyview'] = 'Copy page';
 $string['createemptyview'] = 'Create empty page';
 $string['copyaview'] = 'Copy a page';
 $string['copyvieworcollection'] = 'Copy a page or collection';
-$string['confirmcopytitle'] = 'Confirm copy';
+$string['confirmcopytitle'] = 'Confirm copying';
 $string['confirmcopydesc'] = 'Please choose which you would like to copy:';
 $string['Untitled'] = 'Untitled';
 $string['copyfornewusers'] = 'Copy for new users';