merge -r5898:5928 (not excluding riverdashboard, notifications, and messageboard) from 1.7 to trunk.

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

1 files changed, 24 insertions, 24 deletions

diff --git a/mod/invitefriends/languages/en.php b/mod/invitefriends/languages/en.php
index 357ceeeea..fa6cb3fd9 100644
--- a/mod/invitefriends/languages/en.php
+++ b/mod/invitefriends/languages/en.php
@@ -1,31 +1,32 @@
 <?php
 
-	/**
-	 * Elgg invite page
-	 * 
-	 * @package ElggFile
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @link http://elgg.org/
-	 */
-
-	$english = array(
-
-		'friends:invite' => 'Invite friends',
-		'invitefriends:introduction' => 'To invite friends to join you on this network, enter their email addresses below (one per line):',
-		'invitefriends:message' => 'Enter a message they will receive with your invitation:',
-		'invitefriends:subject' => 'Invitation to join %s',
+/**
+ * Elgg invite language file
+ * 
+ * @package ElggInviteFriends
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @link http://elgg.org/
+ */
+
+$english = array(
+
+	'friends:invite' => 'Invite friends',
+	'invitefriends:introduction' => 'To invite friends to join you on this network, enter their email addresses below (one per line):',
+	'invitefriends:message' => 'Enter a message they will receive with your invitation:',
+	'invitefriends:subject' => 'Invitation to join %s',
+
+	'invitefriends:success' => 'Your friends were invited.',
+	'invitefriends:email_error' => 'Invitations were sent, but the following addresses are not valid: %s',
+	'invitefriends:failure' => 'Your friends could not be invited.',
 	
-		'invitefriends:success' => 'Your friends were invited.',
-		'invitefriends:email_error' => 'Invitations were sent, but the following addresses are not valid: %s',
-		'invitefriends:failure' => 'Your friends could not be invited.',
-	
-		'invitefriends:message:default' => '
+	'invitefriends:message:default' => '
 Hi,
 
 I want to invite you to join my network here on %s.',
-		'invitefriends:email' => '
+
+	'invitefriends:email' => '
 You have been invited to join %s by %s. They included the following message:
 
 %s
@@ -38,5 +39,4 @@ You will automatically add them as a friend when you create your account.',
 	
 	);
 					
-	add_translation("en",$english);
-?>
+add_translation("en", $english);