Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	lang/en.yml
	templates/CMSPageHistoryController_versions.ss

code/controllers/AssetAdmin.php

@@ -380,7 +380,7 @@ JS
 		$actions = new FieldList(
 			FormAction::create('doSearch',  _t('CMSMain_left_ss.APPLY_FILTER', 'Apply Filter'))
 			->addExtraClass('ss-ui-action-constructive'),
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset'))
 		);
 		
 		$form = new Form($this, 'filter', $fields, $actions);

lang/en.yml

@@ -113,7 +113,7 @@ en:
     MENUTITLE: 'Edit Page'
     AddPageRestriction: 'Note: Some page types are not allowed for this selection'
   CMSMain_left_ss:
-    'APPLY FILTER': 'Apply Filter'
+    'APPLY_FILTER': 'Apply Filter'
     RESET: Reset
   CMSPageAddController:
     ParentMode_child: 'Under another page'
@@ -266,7 +266,7 @@ en:
     ParameterLiveCheckbox: 'Check live site'
     REPEMPTY: 'The {title} report is empty.'
   SilverStripeNavigatorLink:
-    ShareInstructions: 'To share this page, copy and paste the link below.'
+    ShareInstructions: 'To share a this to this page, copy and paste the link below.'
     ShareLink: 'Share link'
   SilverStripeNavigatorLinkl:
     CloseLink: Close