From 05d2e51dfa3cd9f8fb9bbfd7f20aad3fdaebe71d Mon Sep 17 00:00:00 2001
From: Tom Rix <tom@rixth.org>
Date: Mon, 1 Mar 2010 21:39:43 +0000
Subject: [PATCH] MINOR updated naming of permissions (from r90328)

---
 code/GroupSubsites.php |  2 +-
 code/Subsite.php       |  4 +---
 lang/en_US.php         | 31 +++++++++++++++++++++++++------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/code/GroupSubsites.php b/code/GroupSubsites.php
index 2880d91..0923433 100644
--- a/code/GroupSubsites.php
+++ b/code/GroupSubsites.php
@@ -210,7 +210,7 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider {
 	
 	function providePermissions() {
 		return array(
-			'SECURITY_SUBSITE_GROUP' => 'Edit the subsite a group can access'
+			'SECURITY_SUBSITE_GROUP' => 'Manage subsites for groups'
 		);
 	}
 
diff --git a/code/Subsite.php b/code/Subsite.php
index 9fe4f23..bb83c53 100644
--- a/code/Subsite.php
+++ b/code/Subsite.php
@@ -547,9 +547,7 @@ JS;
 
 	function providePermissions() {
 		return array(
-			'SUBSITE_EDIT' => 'Edit subsite Details',
-			'SUBSITE_ASSETS_EDIT' => 'Edit subsite Assets Admin',
-			'SUBSITE_ASSETS_CREATE_SUBSITE' => 'Create/edit subsite specific asset folders'
+			'SUBSITE_ASSETS_CREATE_SUBSITE' => 'Manage assets for subsites'
 		);
 	}
 
diff --git a/lang/en_US.php b/lang/en_US.php
index 1bf710a..d069bb7 100644
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -3,16 +3,25 @@
 global $lang;
 
 $lang['en_US']['SubsiteAdmin']['MENUTITLE'] = array(
-	'Subsites',
+	'Subsite',
 	100,
 	'Menu title'
 );
-$lang['en_US']['GroupSubsites']['SECURITYACCESS'] = array(
-	'Limit CMS access to subsites',
-	PR_MEDIUM,
-	'Dropdown listing existing subsites which this group has access to'
-);
+$lang['en_US']['GroupSubsites']['ACCESSALL'] = 'All subsites';
+$lang['en_US']['GroupSubsites']['ACCESSONLY'] = 'Only these subsites';
+$lang['en_US']['GroupSubsites']['ACCESSRADIOTITLE'] = 'Give this group access to';
 $lang['en_US']['GroupSubsites']['SECURITYTABTITLE'] = 'Subsites';
+$lang['en_US']['ModelAdmin']['LOADEDFOREDITING'] = 'Loaded \'%s\' for editing.';
+$lang['en_US']['RelatedPageLink']['PLURALNAME'] = array(
+	'Related Page Links',
+	50,
+	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
+);
+$lang['en_US']['RelatedPageLink']['SINGULARNAME'] = array(
+	'Related Page Link',
+	50,
+	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
+);
 $lang['en_US']['Subsite']['PLURALNAME'] = array(
 	'Subsits',
 	50,
@@ -23,6 +32,16 @@ $lang['en_US']['Subsite']['SINGULARNAME'] = array(
 	50,
 	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
 );
+$lang['en_US']['SubsiteDomain']['PLURALNAME'] = array(
+	'Subsite Domains',
+	50,
+	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
+);
+$lang['en_US']['SubsiteDomain']['SINGULARNAME'] = array(
+	'Subsite Domain',
+	50,
+	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
+);
 $lang['en_US']['Subsite_Template']['PLURALNAME'] = array(
 	'Subsite Templats',
 	50,