merged in notifications plugin cleanup from 1.7 branch: [5962], [5978] - [5980], [6000]

git-svn-id: http://code.elgg.org/elgg/trunk@6020 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 25 insertions, 27 deletions

diff --git a/mod/notifications/languages/en.php b/mod/notifications/languages/en.php
index 8573bbb32..a82013d23 100644
--- a/mod/notifications/languages/en.php
+++ b/mod/notifications/languages/en.php
@@ -1,29 +1,27 @@
 <?php
 
-	$english = array(
-	
-		'friends:all' => 'All friends',
-	
-		'notifications:subscriptions:personal:description' => 'Receive notifications when actions are performed on your content',
-		'notifications:subscriptions:personal:title' => 'Personal notifications',
-	
-		'notifications:subscriptions:collections:title' => 'Friends',
-		'notifications:subscriptions:collections:description' => 'The following is an automatic collection made up of your friends. To receive updates select below. This will affect the corresponding users in the main notification settings panel at the bottom of the page. ',
-		'notifications:subscriptions:collections:edit' => 'To edit your shared access notifications, click here.',
-	
-		'notifications:subscriptions:changesettings' => 'Notifications',
-		'notifications:subscriptions:changesettings:groups' => 'Group notifications',
-		'notification:method:email' => 'Email',	
-	
-		'notifications:subscriptions:title' => 'Notifications per user',
-		'notifications:subscriptions:description' => 'To receive notifications from your friends (on an individual basis) when they create new content, find them below and select the notification method you would like to use.',
-	
-		'notifications:subscriptions:groups:description' => 'To receive notifications when new content is added to a group you are a member of, find it below and select the notification method(s) you would like to use.',
-	
-		'notifications:subscriptions:success' => 'Your notifications settings have been saved.',
-	
-	);
-					
-	add_translation("en",$english);
-
-?>
\ No newline at end of file
+$english = array(
+
+	'friends:all' => 'All friends',
+
+	'notifications:subscriptions:personal:description' => 'Receive notifications when actions are performed on your content',
+	'notifications:subscriptions:personal:title' => 'Personal notifications',
+
+	'notifications:subscriptions:collections:title' => 'Friends',
+	'notifications:subscriptions:collections:description' => 'The following is an automatic collection made up of your friends. To receive updates select below. This will affect the corresponding users in the main notification settings panel at the bottom of the page. ',
+	'notifications:subscriptions:collections:edit' => 'To edit your shared access notifications, click here.',
+
+	'notifications:subscriptions:changesettings' => 'Notifications',
+	'notifications:subscriptions:changesettings:groups' => 'Group notifications',
+	'notification:method:email' => 'Email',	
+
+	'notifications:subscriptions:title' => 'Notifications per user',
+	'notifications:subscriptions:description' => 'To receive notifications from your friends (on an individual basis) when they create new content, find them below and select the notification method you would like to use.',
+
+	'notifications:subscriptions:groups:description' => 'To receive notifications when new content is added to a group you are a member of, find it below and select the notification method(s) you would like to use.',
+
+	'notifications:subscriptions:success' => 'Your notifications settings have been saved.',
+
+);
+
+	add_translation("en", $english);